David Yip 201e82686f Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss		2018-01-17 18:37:09 -06:00
..
elephant-fren.png	…
elephant-friend-1.png	…
elephant_ui_disappointed.svg	Fix home regeneration (#6251)	2018-01-17 23:56:03 +01:00
elephant_ui_working.svg	Fix home regeneration (#6251)	2018-01-17 23:56:03 +01:00
icon_about.png	…
icon_blocks.png	…
icon_cached.svg	Use better reblog icon and improve contrast in HTML e-mails (#6272)	2018-01-17 14:12:59 +01:00
icon_email.svg	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
icon_grade.svg	HTML e-mails for NotificationMailer (#6263)	2018-01-16 20:20:15 +01:00
icon_home.png	…
icon_likes.png	…
icon_local.png	…
icon_lock_open.svg	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
icon_logout.png	…
icon_mutes.png	…
icon_person_add.svg	HTML e-mails for NotificationMailer (#6263)	2018-01-16 20:20:15 +01:00
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	…
logo.svg	…
logo_alt.svg	…
logo_full.svg	…
logo_transparent.svg	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
mastodon-ui.png	Show mastodon on modal (#6129)	2018-01-02 05:07:56 +01:00
preview.jpg	…
screenshot.jpg	…
start.png	…
void.png	…
wave-compose-standalone.png	Show mastodon on modal (#6129)	2018-01-02 05:07:56 +01:00
wave-drawer.png	…
wave-modal.png	Show mastodon on modal (#6129)	2018-01-02 05:07:56 +01:00