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. |
||
|---|---|---|
| .. | ||
| mailer | ||
| clippy_frame.png | ||
| clippy_wave.gif | ||
| elephant-fren.png | ||
| elephant_ui_disappointed.svg | ||
| elephant_ui_greeting.svg | ||
| elephant_ui_plane.svg | ||
| elephant_ui_working.svg | ||
| icon_about.png | ||
| icon_blocks.png | ||
| icon_cached.svg | ||
| icon_done.svg | ||
| icon_email.svg | ||
| icon_file_download.svg | ||
| icon_follow_requests.png | ||
| icon_grade.svg | ||
| icon_home.png | ||
| icon_keyboard_shortcuts.png | ||
| icon_likes.png | ||
| icon_lists.png | ||
| icon_local.png | ||
| icon_lock_open.svg | ||
| icon_logout.png | ||
| icon_mutes.png | ||
| icon_person_add.svg | ||
| icon_pin.png | ||
| icon_public.png | ||
| icon_reply.svg | ||
| icon_settings.png | ||
| logo.svg | ||
| logo_alt.svg | ||
| logo_full.svg | ||
| logo_transparent.svg | ||
| preview.jpg | ||
| reticle.png | ||
| screenshot.jpg | ||
| start.png | ||
| void.png | ||
