dolibarr/htdocs/core/menus
Laurent Destailleur 47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
..
standard Merge remote-tracking branch 'origin/3.9' into develop 2016-02-03 03:27:17 +01:00
index.html Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
init_menu_auguria.sql Merge remote-tracking branch 'origin/3.9' into develop 2016-02-03 03:27:17 +01:00