mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 06:38:39 +09: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. |
||
---|---|---|
.. | ||
_content_spoiler.html.haml | ||
_detailed_status.html.haml | ||
_media.html.haml | ||
_more.html.haml | ||
_og_description.html.haml | ||
_og_image.html.haml | ||
_simple_status.html.haml | ||
_status.html.haml | ||
embed.html.haml | ||
show.html.haml |