David Yip b1155460ba Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss		2018-01-17 18:37:09 -06:00
..
v1	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-17 18:37:09 -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	Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)	2017-10-03 23:21:19 +02:00
subscriptions_controller.rb