Laurent Destailleur 838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php

2019-12-14 14:53:49 +01:00

..

admin

doxygen

2019-12-11 23:04:27 +01:00

class

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

2019-12-14 14:53:49 +01:00

group

factoring token usage

2019-12-01 10:20:11 +01:00

notify

replace deprecated user->societe_id by user->socid

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

agenda_extsites.php

Scrutinizer Auto-Fixes

2019-12-03 10:17:29 +00:00

bank.php

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

2019-12-14 14:53:49 +01:00

card.php

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

2019-12-03 13:58:15 +01:00

clicktodial.php

factoring token usage

2019-12-01 10:20:11 +01:00

document.php

Scrutinizer Auto-Fixes

2019-11-22 13:16:38 +00:00

hierarchy.php

factoring token usage

2019-12-01 10:20:11 +01:00

home.php

factoring token usage

2019-12-01 10:20:11 +01:00

index.html

…

info.php

replace deprecated user->societe_id by user->socid

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

ldap.php

replace deprecated user->societe_id by user->socid

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

list.php

factoring token usage

2019-12-01 10:20:11 +01:00

logout.php

Scrutinizer Auto-Fixes

2019-11-13 18:37:08 +00:00

note.php

factoring token usage

2019-12-01 10:20:11 +01:00

param_ihm.php

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

2019-12-14 14:53:49 +01:00

passwordforgotten.php

Scrutinizer Auto-Fixes

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

perms.php

Merge pull request #12283 from frederic34/socid

2019-11-02 13:34:21 +01:00