Aaryan Khandelwal 26f8c52fd7 fix: merge conflicts resolved

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

..

app

fix: merge conflicts resolved

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

ce

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

2025-01-15 21:12:50 +05:30

core

fix: merge conflicts resolved

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

ee

[WEB-3150] fix: initiative link and project properties (#2215)

2025-01-16 17:24:07 +05:30

helpers

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +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

fix: update tailwind config package

2025-01-14 17:09:40 +05:30

.gitignore

…

.prettierignore

chore: lint related changes and packaging fixes (#6163)

2024-12-06 14:56:49 +05:30

.prettierrc

…

Dockerfile.dev

fix: node version update from 18 to 20

2025-01-09 16:05:39 +05:30

Dockerfile.web

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

google.d.ts

…

manifest.json

…

next-env.d.ts

…

next.config.js

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

package.json

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

postcss.config.js

…

tailwind.config.js

fix: update tailwind config package

2025-01-14 17:09:40 +05:30

tsconfig.json

Merge branch 'preview' into 'sync/ce-ee'

2025-01-15 16:50:33 +05:30

use-font-face-observer.d.ts

…