mirror of
https://github.com/makeplane/plane.git
synced 2026-07-13 22:09:12 +02:00
25bf6d9b60
Fixed merge conflicts Conflicts: apps/api/plane/api/serializers/__init__.py apps/api/plane/api/serializers/module.py apps/api/plane/api/urls/__init__.py apps/api/plane/api/urls/issue.py apps/api/plane/api/urls/member.py apps/api/plane/api/urls/module.py apps/api/plane/api/views/__init__.py apps/api/plane/api/views/asset.py apps/api/plane/api/views/base.py apps/api/plane/api/views/cycle.py apps/api/plane/api/views/intake.py apps/api/plane/api/views/issue.py apps/api/plane/api/views/member.py apps/api/plane/api/views/module.py apps/api/plane/api/views/project.py apps/api/plane/api/views/state.py apps/api/plane/db/models/workspace.py apps/api/plane/settings/common.py apps/api/plane/settings/openapi.py apps/api/plane/urls.py apps/api/plane/utils/openapi/__init__.py apps/api/plane/utils/openapi/auth.py apps/api/plane/utils/openapi/decorators.py apps/api/plane/utils/openapi/hooks.py apps/api/plane/utils/openapi/parameters.py apps/api/requirements/base.txt