Laurent Destailleur 71ca269c71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/core/menus/standard/auguria.lib.php htdocs/core/menus/standard/eldy.lib.php		2014-04-25 20:29:29 +02:00
..
standard	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2014-04-25 20:29:29 +02:00
index.php
init_menu_auguria.sql	Qual: Feature to make payment of salaries has been moved into a module	2014-03-17 14:30:55 +01:00