Prateek Shourya 7f0843abe7 fix: merge conflicts resolved

2024-10-29 20:47:31 +05:30

..

app

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

2024-10-28 18:19:23 +05:30

ce

fix: merge conflicts resolved

2024-10-29 20:47:31 +05:30

core

fix: merge conflicts resolved

2024-10-29 20:47:31 +05:30

ee

Merge pull request #1616 from makeplane/sync/ce-ee

2024-10-28 18:05:27 +05:30

helpers

fix: merge conflicts resolved

2024-10-29 20:47:31 +05:30

public

…

styles

Merge branch 'preview' into sync/ce-ee

2024-10-24 15:49:58 +05:30

.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' into sync/ce-ee

2024-10-24 15:49:58 +05:30

postcss.config.js

…

sentry.client.config.ts

Merge branch 'preview' into sync/ce-ee

2024-10-24 15:49:58 +05:30

sentry.edge.config.ts

Merge branch 'preview' into sync/ce-ee

2024-10-24 15:49:58 +05:30

sentry.properties

…

sentry.server.config.ts

…

tailwind.config.js

…

tsconfig.json

…

use-font-face-observer.d.ts

…