sriram veeraghanta 5e13a8ddc9 fix: merge conflicts

2024-09-23 18:08:27 +05:30

..

app

fix: merge conflicts

2024-09-23 18:08:27 +05:30

ce

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

2024-09-23 17:28:23 +05:30

core

fix: merge conflicts

2024-09-23 18:08:27 +05:30

ee

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

2024-09-23 17:16:37 +05:30

helpers

Merge pull request #1141 from makeplane/sync/10885526835

2024-09-16 19:37:45 +05:30

public

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

2024-09-03 18:31:48 +05:30

styles

[WEB-2332] chore: add desktop app provider. (#1052)

2024-09-06 16:49:03 +05:30

.env.example

[WEB-1116] feat: pages realtime collaboration (#5493)

2024-09-02 17:54:12 +05:30

.eslintignore

…

.eslintrc.js

fix: linting issues and rule changes (#5681)

2024-09-23 17:10:38 +05:30

.gitignore

…

.prettierignore

…

.prettierrc

…

Dockerfile.dev

…

Dockerfile.web

[WEB-1116] feat: pages realtime collaboration (#5493)

2024-09-02 17:54:12 +05:30

google.d.ts

…

instrumentation.ts

…

manifest.json

…

next-env.d.ts

fix: typescript upgrade build errors

2024-09-10 21:31:32 +05:30

next.config.js

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

2024-08-30 19:36:52 +05:30

package.json

fix: merge conflicts

2024-09-23 18:08:27 +05:30

postcss.config.js

…

sentry.client.config.ts

…

sentry.edge.config.ts

…

sentry.properties

…

sentry.server.config.ts

…

tailwind.config.js

…

tsconfig.json

fix: merge conflicts

2024-09-23 18:08:27 +05:30

use-font-face-observer.d.ts

fix: linting issues and rule changes (#5681)

2024-09-23 17:10:38 +05:30