David Yip 54148b9a4a Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss		2018-01-02 00:11:41 -06:00
..
elephant-fren.png
elephant-friend-1.png
elephant-friend.png
icon_about.png
icon_blocks.png
icon_home.png
icon_likes.png
icon_local.png
icon_logout.png
icon_mutes.png
icon_pin.png
icon_public.png
icon_settings.png
logo.svg
logo_alt.svg
logo_full.svg
mastodon-not-found.png
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