Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components.		2023-06-10 16:22:14 +02:00
..
v1	…
v2	…
web	…
base_controller.rb	Fix anonymous visitors getting a session cookie on first visit (#24584)	2023-04-25 16:51:38 +02:00
oembed_controller.rb	…