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

develop Conflicts: htdocs/compta/bank/account.php
2013-05-01 02:35:27 +02:00 · 2013-05-01 02:35:27 +02:00 · 5b85adfb90
commit 5b85adfb90
parent d9e01ae63d 43d64cca1b
1 changed files with 1 additions and 1 deletions
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@ -806,4 +806,4 @@ else
 llxFooter();
 $db->close();
-?>
+?>