luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-10-19 05:54:43 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Claire abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did.
2023-04-22 10:06:11 +02:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2023-04-22 10:06:11 +02:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
web
base_controller.rb
oembed_controller.rb