Merge branch 'master' into 'task_languageCleanup'

# Conflicts: # Classes/Service/MailTemplateService.php

Merge branch 'master' into 'task_languageCleanup'
# Conflicts: # Classes/Service/MailTemplateService.php
fceb4fdf · Kevin Ditscheid · 4bb3af08 · 94d44196 · fceb4fdf · fceb4fdf
Commit fceb4fdf authored May 06, 2021 by Kevin Ditscheid
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

composer.json composer.json +1 -1

ext_emconf.php ext_emconf.php +1 -1

No files found.
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
    "license": [
        "GPL-2.0-or-later"
    ],
-    "version": "6.0.9",
+    "version": "6.0.10",
    "repositories": [
        {
            "type": "composer",

--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -8,7 +8,7 @@ $EM_CONF['sg_mail'] = [
 	'title' => 'Mail Templates',
 	'description' => 'Mail Templates',
 	'category' => 'module',
-	'version' => '6.0.9',
+	'version' => '6.0.10',
 	'state' => 'stable',
 	'uploadfolder' => FALSE,
 	'createDirs' => '',