dolibarr/htdocs/core/modules/project
Laurent Destailleur 89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
2018-12-18 21:55:14 +01:00
..
doc Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-18 21:55:14 +01:00
task Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +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
mod_project_simple.php Several fixes in project creation, cache of dolGetIfFromCode, ... 2018-11-15 13:39:12 +01:00
mod_project_universal.php Several fixes in project creation, cache of dolGetIfFromCode, ... 2018-11-15 13:39:12 +01:00
modules_project.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00