Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		2019-01-02 15:36:53 +01:00
..
mailer	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
clippy_frame.png
clippy_wave.gif
elephant-fren.png
elephant_ui_disappointed.svg
elephant_ui_greeting.svg	Restore onboarding modal (#6303)	2018-01-20 01:32:37 +01:00
elephant_ui_plane.svg
elephant_ui_working.svg
icon_about.png
icon_blocks.png
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_flag.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	HTML e-mails for NotificationMailer (#6263)	2018-01-16 20:20:15 +01:00
icon_pin.png
icon_public.png
icon_reply.svg
icon_settings.png
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
logo_full.svg
logo_transparent.svg	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
preview.jpg
reticle.png
screen_federation.svg
screen_hello.svg
screen_interactions.svg
screenshot.jpg
start.png
void.png