luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-25 08:13:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
v2 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
web Fix web push notifications for polls (#10864) 2019-05-28 00:26:08 +02:00
base_controller.rb Fix uncaught parameter missing exceptions and missing error templates (#11702) 2019-08-30 01:34:47 +02:00
oembed_controller.rb Update status embeds (#4742) 2017-08-30 10:23:43 +02:00
proofs_controller.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00