mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-01 19:14:23 +00:00
d392020da6
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| base_controller_spec.rb | ||
| oembed_controller_spec.rb | ||
| push_controller_spec.rb | ||
| salmon_controller_spec.rb | ||
| subscriptions_controller_spec.rb | ||