luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-19 16:39:23 +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
web
base_controller.rb
oembed_controller.rb
proofs_controller.rb Fix proofs API being inaccessible in secure mode (#12495) 2019-11-28 04:07:49 +01:00