Merge branch 'develop' into midhun/memberlist-redesign

2025-01-07 00:07:06 +05:30
parent ec78793812 7b565e7997
commit 64ef538f6c
2379 changed files with 2555 additions and 2536 deletions
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
        "type": "git",
        "url": "https://github.com/element-hq/element-web"
    },
-    "license": "AGPL-3.0-only OR GPL-3.0-only",
+    "license": "SEE LICENSE IN README.md",
    "files": [
        "lib",
        "res",