Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.		2023-07-17 19:02:23 +02:00
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-17 19:02:23 +02:00
v2
web	Fix embed dropdown menu item for unauthenticated users (#25964)	2023-07-13 15:53:03 +02:00
base_controller.rb
oembed_controller.rb