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
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
v2
web
base_controller.rb	Add force_login option to OAuth authorize page (#8655)	2018-09-09 04:10:44 +02:00
oembed_controller.rb
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb