Merge remote-tracking branch 'origin/master'

Intermesh · Nov 22, 2024 · 93d8ec9 · 93d8ec9
2 parents b892bcf + 3c560f1
commit 93d8ec9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
+18-11-2024: 6.8.86
 - Files: cron job file notification
 - Core: updated german translation
 - Various: route to main grid when details resets / is deleted for mobile view
+- Privacy settings: several bug fixes in addressbook overrides
+- projects2: automatically convert old project_templates_events to tasks
 - Collabora: Added lang variable for collabora
 - Finance: Migration checks if all custom fields are available
 

diff --git a/www/version.php b/www/version.php
@@ -1,2 +1,2 @@
 <?php
-return "6.8.85";
+return "6.8.86";