Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
assets	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
paperclip	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
tasks	…
templates	…
cli.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00