sriram veeraghanta 35a2dffadb fix: merge conflicts

2024-11-27 13:08:48 +05:30

..

app

fix: merge conflicts

2024-11-27 13:08:48 +05:30

ce

fix: merge conflicts

2024-11-27 13:08:48 +05:30

core

fix: merge conflicts

2024-11-27 13:08:48 +05:30

ee

fix: merge conflicts

2024-11-27 13:08:48 +05:30

helpers

Merge branch 'preview' of github.com:makeplane/plane-ee into sync/ce-ee

2024-11-26 20:35:01 +05:30

public

fix: merge conflicts

2024-11-27 13:08:48 +05:30

styles

…

.env.example

…

.eslintignore

…

.eslintrc.js

…

.gitignore

…

.prettierignore

…

.prettierrc

…

Dockerfile.dev

…

Dockerfile.web

…

google.d.ts

…

instrumentation.ts

…

manifest.json

…

next-env.d.ts

…

next.config.js

…

package.json

Merge branch 'preview' of github.com:makeplane/plane-ee into sync/ce-ee

2024-11-26 20:35:01 +05:30

postcss.config.js

…

sentry.client.config.ts

…

sentry.edge.config.ts

…

sentry.properties

…

sentry.server.config.ts

…

tailwind.config.js

…

tsconfig.json

…

use-font-face-observer.d.ts

…