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 d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		6 years ago
..
avatars/original	…
emoji	update twemojie to v2 (#7911)	6 years ago
headers/original	Optimize public/headers/missing.png (#7084)	7 years ago
sounds	…
500.html	Fix error 500 page	7 years ago
android-chrome-192x192.png	Crush PNGs to reduce overall size (#7954)	6 years ago
apple-touch-icon.png	Crush PNGs to reduce overall size (#7954)	6 years ago
background-cybre.png	…
badge.png	Crush PNGs to reduce overall size (#7954)	6 years ago
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)	6 years ago
oops.gif	…
riot-glitch.png	…
robots.txt	…
sw.js	…
web-push-icon_expand.png	Crush PNGs to reduce overall size (#7954)	6 years ago
web-push-icon_favourite.png	Crush PNGs to reduce overall size (#7954)	6 years ago
web-push-icon_reblog.png	…