Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		2018-12-09 16:08:04 +01:00
..
chewy	Get rid of Chewy order/limit warning (#8355)	2018-08-22 02:44:56 +02:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
mailers	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-29 19:22:52 +01:00
serializers	Add backend support to read and update list-specific show_replies settings	2018-11-28 14:46:07 +01:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-09 14:56:31 +01:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
workers	Improve account suspension speed and completeness (#9290)	2018-12-03 01:32:08 +01:00