Claire 24c1b04f9c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our README.		2022-03-15 20:45:27 +01:00
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-15 20:45:27 +01:00
v2	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
web	Add notifications for new sign-ups (#16953)	2022-02-23 16:45:22 +01:00
base_controller.rb	Change authorized applications page (#17656)	2022-03-01 16:48:58 +01:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00