florian HENRY 137f1c4e4f Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0 ...

Conflicts:
	htdocs/resource/class/dolresource.class.php

2016-08-18 08:49:54 +02:00

..

class

Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0

2016-08-18 08:49:54 +02:00

add.php

Uniformize presentation, add button cancel everywhere

2016-08-12 22:53:30 +02:00

card.php

Debug module resource

2016-06-06 13:14:05 +02:00

contact.php

Debug module resource

2016-06-06 13:14:05 +02:00

document.php

Debug module resource

2016-06-06 13:14:05 +02:00

element_resource.php

FIX #5519

2016-07-26 16:35:54 +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

Fix strict sql

2016-08-02 13:10:09 +02:00

note.php

Debug module resource

2016-06-06 13:14:05 +02:00