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
..
_ip_block.html.haml	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	1 year ago
index.html.haml	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
new.html.haml	Add IP-based rules (#14963)	4 years ago