Merge branch 'master' into develop

Chat-Your-Way · Mar 24, 2024 · e5c6366 · e5c6366
2 parents 7f88ea8 + 518fe56
commit e5c6366
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+deploy.yml merge=ours
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -59,5 +59,5 @@ spring.mail.properties.mail.smtp.starttls.required=true
 message.max.amount.reports=2
 
 #Logging:
-logging.level.com.chat.yourway=${LOGGING_LEVEL:info}
+logging.level.com.chat.yourway=${LOGGING_LEVEL:trace}