mirror of https://github.com/tootsuite/mastodon
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. |
||
|---|---|---|
| .. | ||
| avatars/original | ||
| emoji | ||
| headers/original | ||
| sounds | ||
| 500.html | ||
| android-chrome-192x192.png | ||
| apple-touch-icon.png | ||
| background-cybre.png | ||
| badge.png | ||
| browserconfig.xml | ||
| clock.js | ||
| embed.js | ||
| favicon-dev.ico | ||
| favicon.ico | ||
| logo-cybre-glitch.gif | ||
| mask-icon.svg | ||
| mstile-150x150.png | ||
| oops.gif | ||
| riot-glitch.png | ||
| robots.txt | ||
| sw.js | ||
| web-push-icon_expand.png | ||
| web-push-icon_favourite.png | ||
| web-push-icon_reblog.png | ||
