You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire c6212d89f8 Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.		1 year ago
..
v1	Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream	1 year ago
v2	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
web	Refactor formatter (#17828)	3 years ago
base_controller.rb	Fix anonymous visitors getting a session cookie on first visit (#24584)	2 years ago
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	5 years ago