imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		2018-02-23 23:28:31 +09:00
..
mailer	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
clippy_frame.png
clippy_wave.gif
elephant-fren.png
elephant_ui_disappointed.svg	Fix home regeneration (#6251)	2018-01-17 23:56:03 +01:00
elephant_ui_greeting.svg	Restore onboarding modal (#6303)	2018-01-20 01:32:37 +01:00
elephant_ui_plane.svg	Replace drawer elephant graphic with a vector image (#6286)	2018-01-19 15:25:27 +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_done.svg	Replace tutorial modal with welcome e-mail (#6273)	2018-01-18 19:17:25 +01:00
icon_email.svg	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
icon_file_download.svg	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
icon_follow_requests.png
icon_grade.svg	HTML e-mails for NotificationMailer (#6263)	2018-01-16 20:20:15 +01:00
icon_home.png
icon_keyboard_shortcuts.png
icon_likes.png
icon_lists.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
preview.jpg
reticle.png	Focal points (#6520)	2018-02-22 00:35:46 +01:00
screenshot.jpg
start.png
void.png