Laurent Destailleur 8fe799f424 Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr ...

into aternatik-dol_resource

Conflicts:
	dev/initdata/img/printcompany.png
	htdocs/compta/bank/card.php

2016-04-29 17:51:11 +02:00

..

dolresource.class.php

Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr

2016-04-29 17:51:11 +02:00

html.formresource.class.php

Replace reserved keyword "Resource" by "DolResource"

2016-01-21 11:26:21 +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