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.		2020-12-15 14:27:06 +01:00
..
avatars/original	…
emoji	Add border around 🕺 emoji (#14769)	2020-09-10 19:08:03 +02:00
headers/original	…
ocr/lang-data	Add OCR tool to media editing modal (#11566)	2019-08-15 15:13:26 +02:00
shortcuts	Add app shortcuts (#15234)	2020-12-15 02:04:56 +01:00
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)	2020-05-08 21:22:57 +02:00
logo-cybre-glitch.gif	…
mask-icon.svg	…
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	…
robots.txt	Disallow robots from indexing /interact/ (#10666)	2019-05-02 00:10:19 +02:00
sw.js	…
web-push-icon_expand.png	…
web-push-icon_favourite.png	…
web-push-icon_reblog.png	…