luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-10 00:46:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
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 Update status embeds (#4742) 2017-08-30 10:23:43 +02:00
push_controller.rb Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205) 2017-07-14 23:01:20 +02:00
salmon_controller.rb Fix HTTP responses for salmon and ActivityPub inbox processing (#5200) 2017-10-03 23:21:19 +02:00
subscriptions_controller.rb