Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.		2018-09-11 16:51:26 +02:00
..
authorizations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-11 16:51:26 +02: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