mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
ad6ddb9bdd
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'. |
||
---|---|---|
.. | ||
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 |