luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 12:19:27 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
2022-03-22 17:00:38 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
v2
web
base_controller.rb Fix locale not being set in REST API (#17847) 2022-03-22 12:29:04 +01:00
oembed_controller.rb