Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		2021-03-02 12:06:58 +01:00
..
avatars/original
emoji	Add borders to 📱 and 📲 emojis (#15794)	2021-03-01 21:22:54 +01:00
headers/original	Optimize public/headers/missing.png (#7084)	2018-04-09 11:34:48 +02:00
ocr/lang-data
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	All cybrespace changes through 5/28	2017-06-23 21:45:14 +00:00
badge.png
browserconfig.xml
clock.js
embed.js
favicon-dev.ico
favicon.ico
inert.css
logo-cybre-glitch.gif
mask-icon.svg
mstile-150x150.png
oops.gif
oops.png
riot-glitch.png
robots.txt
sw.js
web-push-icon_expand.png
web-push-icon_favourite.png
web-push-icon_reblog.png