Laurent Destailleur 83447243ae Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php

2014-09-15 22:58:39 +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

project.class.php

Merge remote-tracking branch 'origin/3.6' into develop

2014-09-15 22:58:39 +02:00

task.class.php

Merge remote-tracking branch 'origin/3.6' into develop

2014-09-15 22:58:39 +02:00