Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
Files
aee6fce9f85d38cfe2a05af77eea7d30a62ea1b3
dolibarr-fork/dev/skeletons
History
Laurent Destailleur 1af74b4c42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/admin/perms.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/product/class/product.class.php
	htdocs/product/class/service.class.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/public/members/new.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
..
README.md
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-09 12:50:56 +02:00

README.md

Files and tools were moved into htdocs/modulebuilder/template