Merge pull request #214 from MerginMaps/master

Master develop compatibility 2024.2.0
MerginMaps · Apr 18, 2024 · 015b33e · 015b33e
2 parents c604ea4 + 24ce2fd
commit 015b33e
Show file tree

Hide file tree

Showing 6 changed files with 631 additions and 2 deletions.
diff --git a/.prod.env b/.prod.env
@@ -91,6 +91,7 @@ MAIL_SERVER=fixme
 #MAIL_SUPPRESS_SEND=True
 
 #MAIL_USE_TLS=True
+#MAIL_USE_SSL=False
 
 #MAIL_USERNAME=NODEFAULT
 MAIL_USERNAME=fixme

diff --git a/LICENSES/CLA-signed-list.md b/LICENSES/CLA-signed-list.md
@@ -3,6 +3,7 @@ Please add your GitHub username and date to the lists below to sign that:
 A/ You have read and agree to the individual CLA: https://merginmaps.com/licenses/individual-cla
 
 * `alhirzel`, 20th December 2023
+* `uprel`, 18th March 2024
 
 B/ I have read and agree with entity CLA for my company: https://merginmaps.com/licenses/entity-cla