Merge branch 'develop' into toomanylines

2019-01-27 17:59:13 +01:00
parent 496fa9b0fb d1befcb1ba
commit f30a3d59ba
749 changed files with 4048 additions and 3937 deletions
--- a/htdocs/core/lib/import.lib.php
+++ b/htdocs/core/lib/import.lib.php
@@ -32,7 +32,7 @@
 * @param	int			$maxstep	Limit steps to maxstep or no limit if 0
 * @return	array					Array of tabs
 */
-function import_prepare_head($param, $maxstep=0)
+function import_prepare_head($param, $maxstep = 0)
 {
 	global $langs;