Laurent Destailleur 19162fc8d5 Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into ...

PeartreeG-patch-1

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/resource/element_resource.php

2016-04-29 18:31:11 +02:00

..

class

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

2016-04-29 17:51:11 +02: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

Replace reserved keyword "Resource" by "DolResource"

2016-01-21 11:26:21 +01:00

card.php

Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into

2016-04-29 18:31:11 +02:00

contact.php

Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into

2016-04-29 18:31:11 +02:00

document.php

Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into

2016-04-29 18:31:11 +02:00

element_resource.php

Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into

2016-04-29 18:31:11 +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

list.php

Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into

2016-04-29 18:31:11 +02:00

note.php

Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into

2016-04-29 18:31:11 +02:00