Claire ad6ddb9bdd Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/environments/production.rb`: Upstream changed a header but we had different default headers. Applied the same change, and also dropped HSTS headers redundant with Rails'.		2022-01-26 22:32:21 +01:00
..
accept_spec.rb
add_spec.rb
announce_spec.rb
block_spec.rb
create_spec.rb
delete_spec.rb
flag_spec.rb
follow_spec.rb
like_spec.rb
move_spec.rb
reject_spec.rb
remove_spec.rb
undo_spec.rb
update_spec.rb	Fix poll updates being saved as status edits (#17373)	2022-01-26 18:05:39 +01:00