Thibaut Girka c384e0f3de Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml		2018-05-19 22:41:10 +02:00
..
authorizations_controller.rb	change pack to 'auth'	2017-12-11 18:14:41 -06:00
authorized_applications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
tokens_controller.rb	Ensure push subscription is immediately removed when application is revoked (#7548)	2018-05-19 21:05:08 +02:00