Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		2019-03-20 13:54:00 +01:00
..
mailer
proof_providers
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
icon_about.png
icon_blocks.png	Theme: Windows 95	2017-10-26 23:22:48 -07:00
icon_cached.svg
icon_done.svg
icon_email.svg
icon_file_download.svg
icon_flag.svg
icon_follow_requests.png
icon_grade.svg
icon_home.png
icon_keyboard_shortcuts.png	Win95 to 2.1	2018-01-05 16:22:58 -08:00
icon_likes.png	Theme: Windows 95	2017-10-26 23:22:48 -07:00
icon_lists.png
icon_local.png	Theme: Windows 95	2017-10-26 23:22:48 -07:00
icon_lock_open.svg	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
icon_logout.png
icon_mutes.png	Theme: Windows 95	2017-10-26 23:22:48 -07:00
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
logo_alt.svg
logo_full.svg
logo_transparent.svg	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
logo_transparent_black.svg
preview.jpg
reticle.png
screen_federation.svg
screen_hello.svg
screen_interactions.svg
screenshot.jpg
start.png
void.png