mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-28 08:06:49 +00:00
c48ec9cb8c
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug. |
||
|---|---|---|
| .. | ||
| 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 | ||