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	Z indexes and colors	2018-01-06 18:38:19 -08:00
clippy_wave.gif	To 2.1.2	2018-01-06 18:25:19 -08:00
elephant-fren.png	Crush PNGs to reduce overall size (#7954)	2018-07-05 15:20:16 +02:00
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	Use better reblog icon and improve contrast in HTML e-mails (#6272)	2018-01-17 14:12:59 +01:00
icon_done.svg
icon_email.svg
icon_file_download.svg	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
icon_flag.svg	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
icon_follow_requests.png	Win95 to 2.1	2018-01-05 16:22:58 -08:00
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
icon_lists.png	Win95 to 2.1	2018-01-05 16:22:58 -08:00
icon_local.png	Theme: Windows 95	2017-10-26 23:22:48 -07:00
icon_lock_open.svg
icon_logout.png	Theme: Windows 95	2017-10-26 23:22:48 -07:00
icon_mutes.png
icon_person_add.svg
icon_pin.png	Theme: Windows 95	2017-10-26 23:22:48 -07:00
icon_public.png
icon_reply.svg	HTML e-mails for NotificationMailer (#6263)	2018-01-16 20:20:15 +01:00
icon_settings.png	Theme: Windows 95	2017-10-26 23:22:48 -07:00
logo.svg
logo_alt.svg	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	2017-09-15 00:51:00 +02:00
logo_full.svg
logo_transparent.svg
logo_transparent_black.svg
preview.jpg
reticle.png
screen_federation.svg
screen_hello.svg
screen_interactions.svg
screenshot.jpg	Screenshot support for themes	2017-12-10 20:32:28 -08:00
start.png
void.png