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
emoji	update twemojie to v2 (#7911)	2018-07-06 01:58:07 +02:00
headers/original
sounds
500.html
android-chrome-192x192.png
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
embed.js
favicon-dev.ico
favicon.ico
logo-cybre-glitch.gif
mask-icon.svg	New logo (#4306)	2017-07-23 02:40:39 +02:00
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	cybrespace to 1.4.2	2017-06-23 21:45:14 +00:00
robots.txt	Disallow robots from indexing /interact/ (#10666)	2019-05-02 00:10:19 +02:00
sw.js	fix #4356 : place sw.js to assets/sw.js (#4357)	2017-07-28 01:55:52 +02:00
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png