341b653578
Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js` |
||
|---|---|---|
| .. | ||
| avatars/original | ||
| emoji | ||
| headers/original | ||
| ocr/lang-data | ||
| sounds | ||
| 500.html | ||
| background-cybre.png | ||
| badge.png | ||
| clock.js | ||
| embed.js | ||
| favicon.ico | ||
| inert.css | ||
| logo-cybre-glitch.gif | ||
| oops.gif | ||
| oops.png | ||
| riot-glitch.png | ||
| robots.txt | ||
| sw.js | ||
| sw.js.map | ||
| web-push-icon_expand.png | ||
| web-push-icon_favourite.png | ||
| web-push-icon_reblog.png | ||
