Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
TYPO3
sg_mail
Commits
fceb4fdf
Commit
fceb4fdf
authored
May 06, 2021
by
Kevin Ditscheid
Browse files
Merge branch 'master' into 'task_languageCleanup'
# Conflicts: # Classes/Service/MailTemplateService.php
parents
4bb3af08
94d44196
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
composer.json
composer.json
+1
-1
ext_emconf.php
ext_emconf.php
+1
-1
No files found.
composer.json
View file @
fceb4fdf
...
...
@@ -6,7 +6,7 @@
"license"
:
[
"GPL-2.0-or-later"
],
"version"
:
"6.0.
9
"
,
"version"
:
"6.0.
10
"
,
"repositories"
:
[
{
"type"
:
"composer"
,
...
...
ext_emconf.php
View file @
fceb4fdf
...
...
@@ -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'
=>
''
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment