Merge pull request #6931 from tech-conferences/fczgzozbmocytveiuio

Add The Matrix Conference for general, networking

conferences/2024/general.json

@@ -1071,6 +1071,20 @@
     "cfpEndDate": "2024-07-05",
     "twitter": "@FlutterconWorld"
   },
+  {
+    "name": "The Matrix Conference",
+    "url": "https://2024.matrix.org",
+    "startDate": "2024-09-19",
+    "endDate": "2024-09-22",
+    "city": "Berlin",
+    "country": "Germany",
+    "online": true,
+    "locales": "EN",
+    "cocUrl": "https://matrix.org/legal/code-of-conduct/",
+    "cfpUrl": "https://cfp.matrix.org/matrixconf2024/cfp",
+    "cfpEndDate": "2024-06-26",
+    "mastodon": "@[email protected]"
+  },
   {
     "name": "JoomlaDay DACH",
     "url": "https://dach.joomladay.org",

conferences/2024/networking.json

@@ -359,6 +359,20 @@
     "cocUrl": "https://nyc.droidcon.com/code-of-conduct/",
     "twitter": "@droidconnyc"
   },
+  {
+    "name": "The Matrix Conference",
+    "url": "https://2024.matrix.org",
+    "startDate": "2024-09-19",
+    "endDate": "2024-09-22",
+    "city": "Berlin",
+    "country": "Germany",
+    "online": true,
+    "locales": "EN",
+    "cocUrl": "https://matrix.org/legal/code-of-conduct/",
+    "cfpUrl": "https://cfp.matrix.org/matrixconf2024/cfp",
+    "cfpEndDate": "2024-06-26",
+    "mastodon": "@[email protected]"
+  },
   {
     "name": "TechHeads Conference",
     "url": "https://techheads.se",