You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		6 years ago
..
avatars/original	…
emoji	update twemojie to v2 (#7911)	7 years ago
headers/original	…
sounds	…
500.html	…
android-chrome-192x192.png	…
apple-touch-icon.png	…
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	…
oops.gif	…
oops.png	Change error graphic to hover-to-play (#10055)	6 years ago
riot-glitch.png	…
robots.txt	Disallow robots from indexing /interact/ (#10666)	6 years ago
sw.js	…
web-push-icon_expand.png	…
web-push-icon_favourite.png	…
web-push-icon_reblog.png	…