dolibarr/htdocs/admin/menus
Laurent Destailleur b57476153f Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
..
edit.php Merge remote-tracking branch 'origin/3.9' into develop 2016-06-04 01:14:36 +02:00
index.php Merge remote-tracking branch 'origin/3.9' into develop 2016-06-04 01:14:36 +02:00
other.php Removed hidden option MAIN_MENU_USE_JQUERY_LAYOUT. This feature will be 2016-04-12 13:38:41 +02:00