Laurent Destailleur 1e13f6fd0f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ...

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

2020-01-29 11:44:04 +01:00

..

class

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

2020-01-29 11:44:04 +01:00

agenda.php

Merge remote-tracking branch 'upstream/develop' into socid

2019-11-02 09:14:15 +01:00

card.php

Fix look and feel v11

2020-01-20 12:39:25 +01:00

contact.php

replace deprecated user->societe_id by user->socid

2019-10-31 20:46:31 +01:00

document.php

Merge remote-tracking branch 'upstream/develop' into socid

2019-11-02 09:14:15 +01:00

element_resource.php

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +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

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

2020-01-29 11:44:04 +01:00

note.php

replace deprecated user->societe_id by user->socid

2019-10-31 20:46:31 +01:00