Merge branch '2024.11'

tine-groupware · Jan 22, 2025 · e194c88 · e194c88
2 parents 17e3cde + 4024bd0
commit e194c88
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 30 deletions.
diff --git a/tine20/composer.json b/tine20/composer.json
@@ -26,55 +26,59 @@
     },
     {
       "type": "git",
-      "url": "https://github.com/tine-groupware/ubl-invoice.git"
+      "url": "https://github.com/tine-groupware/sddl-parser.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine-groupware/ubl-common.git"
+      "url": "https://github.com/tine-groupware/simplesamlphp.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine-groupware/sddl-parser.git"
+      "url": "https://github.com/tine-groupware/timezoneconvert.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine20/OpenDocument.git"
+      "url": "https://github.com/tine-groupware/ubl-invoice.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine20/syncroton.git"
+      "url": "https://github.com/tine-groupware/ubl-common.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine-groupware/timezoneconvert.git"
+      "url": "https://github.com/tine-groupware/zendframework1.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine20/Twig.git"
+      "url": "https://github.com/tine20/dbal.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine20/sabrevobject.git"
+      "url": "https://github.com/tine20/OpenDocument.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine20/sabredav.git"
+      "url": "https://github.com/tine20/PHPExcel.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine20/dbal.git"
+      "url": "https://github.com/tine20/PhpSpreadsheet.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine-groupware/zendframework1.git"
+      "url": "https://github.com/tine20/sabredav.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine20/PHPExcel.git"
+      "url": "https://github.com/tine20/sabrevobject.git"
     },
     {
       "type": "git",
-      "url": "https://github.com/tine20/PhpSpreadsheet.git"
+      "url": "https://github.com/tine20/syncroton.git"
+    },
+    {
+      "type": "git",
+      "url": "https://github.com/tine20/Twig.git"
     },
     {
       "type": "git",
@@ -143,7 +147,7 @@
     "sabre/dav": "^4.5",
     "sabre/vobject": "^4.5",
     "sentry/sentry": "^3",
-    "simplesamlphp/simplesamlphp": "v1.19.*",
+    "simplesamlphp/simplesamlphp": "dev-pu/pm/replaceAssertOptions as v1.19.9",
     "spomky-labs/otphp": "^10.0",
     "symfony/cache": "^5.3",
     "symfony/config": "^4",

diff --git a/tine20/composer.lock b/tine20/composer.lock