David Yip 4cca1d1e7e Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb		2017-12-30 17:20:07 -06:00
..
v1	Merge remote-tracking branch 'origin/master' into merge-upstream	2017-12-30 17:20:07 -06:00
web	Keep WebPush settings (#5879)	2017-12-09 02:31:37 +01:00
base_controller.rb	Remove unused function (#5950)	2017-12-09 23:37:31 +01:00
oembed_controller.rb
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb