mirror of https://framagit.org/tykayn/mastodon.git
fe5f6bc7ed
Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property |
||
|---|---|---|
| .. | ||
| core | ||
| flavours | ||
| fonts | ||
| icons | ||
| images | ||
| locales | ||
| mastodon | ||
| packs | ||
| skins | ||
| styles | ||