Claire b61c3ddff8 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged.

2022-01-16 18:11:20 +01:00

..

v1

Merge branch 'main' into glitch-soc/merge-upstream

2022-01-16 18:11:20 +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

Fix OEmbed leaking information about existence of non-public statuses (#12930)

2020-01-24 00:20:51 +01:00