dolibarr/htdocs/core/menus
Laurent Destailleur f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
2014-10-13 00:50:51 +02:00
..
standard Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 2014-10-13 00:50:51 +02: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 branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 2014-10-13 00:50:51 +02:00