Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		2019-04-01 21:28:31 +02:00
..
bookmarks_controller.rb	…
favourited_by_accounts_controller.rb	Hide blocking accounts from blocked users (#10442)	2019-04-01 20:06:13 +02:00
favourites_controller.rb	…
mutes_controller.rb	…
pins_controller.rb	…
reblogged_by_accounts_controller.rb	Hide blocking accounts from blocked users (#10442)	2019-04-01 20:06:13 +02:00
reblogs_controller.rb	…