Merge remote-tracking branch 'remote/6.0' into upmerge-6.0.7

# Conflicts: # composer.lock
jeabakker · Nov 20, 2024 · 6463686 · 6463686
2 parents e55b802 + 22a628f
commit 6463686
Show file tree

Hide file tree

Showing 4 changed files with 569 additions and 538 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="6.0.7"></a>
+### 6.0.7 (2024-11-20)
+
+#### Contributors
+
+* Jerôme Bakker (2)
+
+
 <a name="6.0.6"></a>
 ### 6.0.6 (2024-10-25)
 
@@ -165,6 +173,14 @@
 * **icons:** icontime metadata is no longer available [7e139b935](https://github.com/Elgg/Elgg/commit/7e139b9352908407bf48edec343c96fbf317df35)
 
 
+<a name="5.1.12"></a>
+### 5.1.12 (2024-11-20)
+
+#### Contributors
+
+* Jerôme Bakker (1)
+
+
 <a name="5.1.11"></a>
 ### 5.1.11 (2024-10-25)
 

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "elgg/elgg",
-    "version": "6.0.6",
+    "version": "6.0.7",
     "description": "Elgg is an award-winning social networking engine, delivering the building blocks that enable businesses, schools, universities and associations to create their own fully-featured social networks and applications.",
     "license": "GPL-2.0-only",
     "minimum-stability": "dev",