Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
mailer
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	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
elephant_ui_working.svg
icon_about.png
icon_blocks.png
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
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
screenshot.jpg
start.png
void.png