Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		2018-10-01 12:43:20 +02:00
..
account_moderation_notes	…
accounts	Add confirmation step to account suspensions (#8353)	2018-08-22 11:53:41 +02:00
action_logs	…
change_emails	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
custom_emojis	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
dashboard	…
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
email_domain_blocks	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
instances	…
invites	…
relays	Display pending message on admin relays UI (#8494)	2018-08-28 05:39:43 +02:00
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
statuses	Allow to show a specific status in the admin interface	2018-09-03 18:19:11 +02:00
subscriptions	…
suspensions	Better singulars of account followers/toots. (#8471)	2018-08-26 21:30:53 +02:00