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
..
appearance	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
notifications	Change admin UI for hashtags and add back whitelisted trends (#11490)	2019-08-05 19:54:29 +02:00
other	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 20:09:05 +02:00