Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml		2019-08-07 13:56:48 +02:00
..
chewy	…
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
mailers	Change admin UI for hashtags and add back whitelisted trends (#11490)	2019-08-05 19:54:29 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
presenters	…
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
workers	…