David Yip f8e934f955 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md		2018-03-12 17:52:19 -05:00
..
avatars/original	add new avatar placeholder missing.png (#6728)	2018-03-11 14:55:38 +01:00
emoji
headers/original
sounds	Add artist, title, and date metadata to boop.{mp3,ogg} (#5531)	2017-10-28 00:05:04 +09:00
500.html
android-chrome-192x192.png	Change Android icon padding again to half of previous (#5339)	2017-10-12 00:58:14 +02:00
apple-touch-icon.png	Add padding to Android icon, change Apple and MS icons (#5321)	2017-10-11 19:11:15 +02:00
background-cybre.png
badge.png
browserconfig.xml
clock.js
embed.js
favicon-dev.ico
favicon.ico
logo-cybre-glitch.gif
mask-icon.svg
mstile-150x150.png	Add padding to Android icon, change Apple and MS icons (#5321)	2017-10-11 19:11:15 +02:00
oops.gif
riot-glitch.png
robots.txt
sw.js
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png