Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... 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.		2018-07-09 07:13:59 +02:00
..
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	Theme: Windows 95	2017-10-26 23:22:48 -07:00
icon_cached.svg
icon_done.svg
icon_email.svg	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
icon_file_download.svg
icon_follow_requests.png
icon_grade.svg
icon_home.png
icon_keyboard_shortcuts.png
icon_likes.png
icon_lists.png	Win95 to 2.1	2018-01-05 16:22:58 -08:00
icon_local.png	Theme: Windows 95	2017-10-26 23:22:48 -07:00
icon_lock_open.svg
icon_logout.png	Theme: Windows 95	2017-10-26 23:22:48 -07:00
icon_mutes.png
icon_person_add.svg
icon_pin.png
icon_public.png
icon_reply.svg	HTML e-mails for NotificationMailer (#6263)	2018-01-16 20:20:15 +01:00
icon_settings.png	Theme: Windows 95	2017-10-26 23:22:48 -07:00
logo.svg	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	2017-09-15 00:51:00 +02:00
logo_alt.svg	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	2017-09-15 00:51:00 +02:00
logo_full.svg	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	2017-09-15 00:51:00 +02:00
logo_transparent.svg
preview.jpg
reticle.png
screenshot.jpg
start.png
void.png