luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-21 03:57:08 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +01:00
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
v2 Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
web Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
base_controller.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
oembed_controller.rb Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00
proofs_controller.rb Fix proofs API being inaccessible in secure mode (#12495) 2019-11-28 04:07:49 +01:00