mastodon/app/controllers/api
Thibaut Girka 8b4abaa90d Merge branch 'master' into glitch-soc/master
Conflicts:
	config/routes.rb

Added the “endorsements” route from upstream.
2018-08-21 18:24:48 +02:00
..
v1 Merge branch 'master' into glitch-soc/master 2018-08-21 18:24:48 +02:00
v2 Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661) 2018-05-29 02:01:24 +02:00
web
base_controller.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
oembed_controller.rb
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb