Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		2018-08-27 18:09:28 +02:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
v2
web
base_controller.rb	Allow mods to disable login, improve message when login disabled (#8329)	2018-08-23 23:26:29 +02:00
oembed_controller.rb
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb