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_spec.rb	…
oembed_controller_spec.rb	…
push_controller_spec.rb	…
salmon_controller_spec.rb	Update Rails (#8141)	2018-08-13 18:17:20 +02:00
subscriptions_controller_spec.rb	Update Rails (#8141)	2018-08-13 18:17:20 +02:00