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 085a1197da Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' 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.		1 year ago
..
v1	Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream	1 year ago
v2	Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream	2 years 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