luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-28 04:49:11 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
v2
web
base_controller.rb
oembed_controller.rb