luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-19 13:23:13 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/api
History
Claire 3869daef09 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
2022-05-03 10:16:49 +02:00
..
v1 Merge branch 'main' into glitch-soc/merge-upstream 2022-05-03 10:16:49 +02:00
v2 Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 23:00:03 +02:00
web Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
base_controller.rb Fix locale not being set in REST API (#17847) 2022-03-22 12:29:04 +01:00
oembed_controller.rb Fix OEmbed leaking information about existence of non-public statuses (#12930) 2020-01-24 00:20:51 +01:00