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

Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		5 years ago
..
avatars/original	…
emoji	Add border around 🕺 emoji (#14769)	5 years ago
headers/original	…
ocr/lang-data	Add OCR tool to media editing modal (#11566)	7 years ago
shortcuts	Add app shortcuts (#15234)	5 years ago
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	…
inert.css	Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679)	6 years ago
logo-cybre-glitch.gif	…
mask-icon.svg	…
mstile-150x150.png	…
oops.gif	…
oops.png	Change error graphic to hover-to-play (#10055)	7 years ago
riot-glitch.png	…
robots.txt	Disallow robots from indexing /interact/ (#10666)	7 years ago
sw.js	…
web-push-icon_expand.png	…
web-push-icon_favourite.png	…
web-push-icon_reblog.png	…