dolibarr/htdocs/projet
Laurent Destailleur ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
..
activity Merge remote-tracking branch 'origin/4.0' into develop 2016-09-21 18:38:30 +02:00
admin
ajax
class Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
stats
tasks Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
card.php NEW introduce option PROJECT_DISABLE_PRIVATE_PROJECT and 2016-09-05 15:13:03 +02:00
contact.php
document.php
element.php Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
ganttchart.inc.php
ganttview.php
graph_opportunities.inc.php
index.php
info.php
jsgantt_language.js.php
list.php Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 18:42:50 +02:00
note.php
tasks.php