392ca0472a
Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes. |
||
---|---|---|
.. | ||
avatars/original | ||
emoji | ||
headers/original | ||
ocr/lang-data | ||
shortcuts | ||
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 | ||
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 |