luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-29 10:03:41 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/controllers/settings/preferences_controller.rb
 	app/lib/user_settings_decorator.rb
 	app/models/user.rb
 	config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
..
v1 Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-18 08:47:10 -05:00
web Add REST API for Web Push Notifications subscriptions (#7445) 2018-05-11 11:49:12 +02:00
base_controller.rb Disable API access when login is disabled (#7289) 2018-04-30 09:13:14 +02:00
oembed_controller.rb
push_controller.rb
salmon_controller.rb Fix response of signature_verification_failure_reason (#6441) 2018-02-08 05:00:45 +01:00
subscriptions_controller.rb