dolibarr/htdocs/resource
Laurent Destailleur e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
..
class Merge pull request #2225 from frederic34/psr2 2015-01-09 22:53:06 +01:00
img Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
add.php Presentation 2014-11-23 21:03:34 +01:00
card.php Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-18 17:13:42 +01:00
element_resource.php Presentation 2014-11-23 21:03:34 +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
list.php Presentation 2014-11-23 21:03:34 +01:00