mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 06:09:08 +09:00
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 |
||
---|---|---|
.. | ||
build-image.yml | ||
check-i18n.yml | ||
linter.yml |