Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
mailer	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
proof_providers	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
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	Fix home regeneration (#6251)	2018-01-17 23:56:03 +01:00
icon_about.png	…
icon_blocks.png	…
icon_cached.svg	…
icon_done.svg	…
icon_email.svg	…
icon_file_download.svg	…
icon_flag.svg	Add moderation warnings (#9519)	2018-12-22 20:02:09 +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	…
icon_logout.png	…
icon_mutes.png	…
icon_person_add.svg	…
icon_pin.png	…
icon_public.png	…
icon_reply.svg	…
icon_settings.png	…
logo.svg	…
logo_alt.svg	…
logo_full.svg	Change full logo to use primary text color of the given theme (#10994)	2019-06-08 15:30:06 +02:00
logo_transparent.svg	Use `<use />` to render transparent SVG logo instead of inserting it (#10845)	2019-05-27 03:33:39 +02:00
logo_transparent_black.svg	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
preview.jpg	…
reticle.png	…
screen_federation.svg	…
screen_hello.svg	…
screen_interactions.svg	Fix icon alignment in onboarding interaction screen (#9686)	2019-01-01 16:19:51 +01:00
screenshot.jpg	…
start.png	…
void.png	…