mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-27 22:23:43 +01:00
12c8ac9e14
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. |
||
|---|---|---|
| .. | ||
| 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 | ||
