4a70792b4a
Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well. |
||
|---|---|---|
| .. | ||
| 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 | ||
