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. |
||
---|---|---|
.. | ||
action_bar.js | ||
autosuggest_account.js | ||
character_counter.js | ||
compose_form.js | ||
emoji_picker_dropdown.js | ||
navigation_bar.js | ||
privacy_dropdown.js | ||
reply_indicator.js | ||
search_results.js | ||
search.js | ||
text_icon_button.js | ||
upload_button.js | ||
upload_form.js | ||
upload_progress.js | ||
upload.js | ||
warning.js |