Prateek Shourya 13595bb2a8 fix: merge conflicts resolved

2025-01-21 20:39:08 +05:30

..

app

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

2025-01-17 19:51:48 +05:30

ce

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

2025-01-17 15:44:01 +05:30

core

fix: merge conflicts resolved

2025-01-21 20:39:08 +05:30

ee

fix: project overview activity page break issue (#2243)

2025-01-21 15:06:06 +05:30

helpers

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

2025-01-17 15:44:01 +05:30

public

fix: merge conflicts resolved

2025-01-16 20:32:57 +05:30

styles

fix: merge conflicts resolved

2025-01-16 20:32:57 +05:30

.env.example

…

.eslintignore

…

.eslintrc.js

…

.gitignore

…

.prettierignore

…

.prettierrc

…

Dockerfile.dev

…

Dockerfile.web

…

google.d.ts

…

manifest.json

…

next-env.d.ts

…

next.config.js

…

package.json

…

postcss.config.js

…

tailwind.config.js

…

tsconfig.json

…

use-font-face-observer.d.ts

…