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

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/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -331,5 +331,4 @@ class modAsset extends DolibarrModules

 		return $this->_init($sql,$options);
 	}
-
 }