Merge remote-tracking branch 'upstream/develop' into camelCaps

2026-02-08 00:52:01 +01:00 · 2018-09-01 13:52:51 +02:00
parent 5100b8b7b0 59a27085fd
commit 57fb3dc2f4
414 changed files with 279 additions and 860 deletions
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -471,7 +471,6 @@ class CMailFile
 			// --------------------------------------
 			$this->error = 'Bad value for sendmode';
 		}
-
 	}