mastodon/app/controllers/api
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
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 Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00