5b8a4f96de
Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict. |
||
---|---|---|
.. | ||
avatars/original | ||
emoji | ||
headers/original | ||
ocr/lang-data | ||
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 |