Thibaut Girka 73bc58c656 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
avatars/original	…
emoji	update twemojie to v2 (#7911)	2018-07-06 01:58:07 +02:00
headers/original	…
sounds	…
500.html	…
android-chrome-192x192.png	Crush PNGs to reduce overall size (#7954)	2018-07-05 15:20:16 +02:00
apple-touch-icon.png	Crush PNGs to reduce overall size (#7954)	2018-07-05 15:20:16 +02:00
background-cybre.png	…
badge.png	Crush PNGs to reduce overall size (#7954)	2018-07-05 15:20:16 +02:00
browserconfig.xml	…
clock.js	…
embed.js	…
favicon-dev.ico	…
favicon.ico	…
logo-cybre-glitch.gif	…
mask-icon.svg	…
mstile-150x150.png	Crush PNGs to reduce overall size (#7954)	2018-07-05 15:20:16 +02:00
oops.gif	…
oops.png	Change error graphic to hover-to-play (#10055)	2019-02-15 23:33:25 +01:00
riot-glitch.png	…
robots.txt	Disallow robots from indexing /interact/ (#10666)	2019-05-02 00:10:19 +02:00
sw.js	…
web-push-icon_expand.png	Crush PNGs to reduce overall size (#7954)	2018-07-05 15:20:16 +02:00
web-push-icon_favourite.png	Crush PNGs to reduce overall size (#7954)	2018-07-05 15:20:16 +02:00
web-push-icon_reblog.png	…