luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-13 02:12:52 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Claire b2915613fb Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Upstream-updated lib textually too close to glitch-soc-only dep.
  Updated like upstream.
2022-01-28 08:58:32 +01:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
web Add policy param to POST /api/v1/push/subscriptions (#16040) 2021-04-15 05:00:25 +02:00
base_controller.rb Add logging of S3-related errors (#16381) 2021-07-21 18:34:39 +02:00
oembed_controller.rb