Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts: htdocs/user/index.php
2017-06-14 10:54:34 +02:00 · 2017-06-14 10:54:34 +02:00 · 00bf4bba13
commit 00bf4bba13
parent b8dd7fb958 848f70e026
1 changed files with 1 additions and 0 deletions
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@ -665,6 +665,7 @@ while ($i < min($num,$limit))
    if (! $i) $totalarray['nbfield']++;

    print "</tr>\n";
+
    $i++;
 }