Merge remote-tracking branch 'origin/develop' into mxandreas/disable-public-rooms

# Conflicts:
#	enterprise
This commit is contained in:
mxandreas
2026-10-09 09:58:27 +03:00
580 changed files with 7016 additions and 2776 deletions
-1
View File
@@ -17,5 +17,4 @@ dependencies {
implementation(projects.libraries.compound)
implementation(projects.libraries.architecture)
implementation(projects.libraries.matrix.api)
implementation(projects.libraries.wellknown.api)
}
@@ -25,7 +25,6 @@ dependencies {
implementation(projects.libraries.architecture)
implementation(projects.libraries.androidutils)
implementation(projects.libraries.matrix.api)
implementation(projects.libraries.wellknown.api)
implementation(libs.serialization.json)
testCommonDependencies(libs)
@@ -18,6 +18,5 @@ dependencies {
implementation(projects.libraries.architecture)
implementation(projects.libraries.compound)
implementation(projects.libraries.matrix.api)
implementation(projects.libraries.wellknown.api)
implementation(projects.tests.testutils)
}