Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
avatars/original	add new avatar placeholder missing.png (#6728)	2018-03-11 14:55:38 +01:00
emoji
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
browserconfig.xml
clock.js	cybrespace to 1.4.2	2017-06-23 21:45:14 +00:00
embed.js
favicon-dev.ico	Use the "m" version of the logo for favicons (#4345)	2017-07-24 19:54:59 +02:00
favicon.ico
logo-cybre-glitch.gif
mask-icon.svg
mstile-150x150.png
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
sw.js
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png