luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 04:39:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Claire ab59743c13 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.
2023-01-14 22:34:09 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2023-01-14 22:34:09 +01:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
web
base_controller.rb Change CSP directives on API to be tight and concise (#20960) 2022-12-15 16:40:32 +01:00
oembed_controller.rb