David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		2018-02-04 16:36:19 -06:00
..
v1	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00
web	Suppress CSRF token warnings (#6240)	2018-01-15 06:51:23 +01:00
base_controller.rb	Refactor /api/web APIs to use the centralized axios instance (#6223)	2018-01-08 20:01:33 +01:00
oembed_controller.rb	…
push_controller.rb	…
salmon_controller.rb	…
subscriptions_controller.rb	…