[Dolibarr/dolibarr] 3ae879: Fix no user $global $conf into $conf object.

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3ae87924f11c5883de9ad551069f9b309832948a
      
https://github.com/Dolibarr/dolibarr/commit/3ae87924f11c5883de9ad551069f9b309832948a
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M htdocs/core/class/conf.class.php

  Log Message:
  -----------
  Fix no user $global $conf into $conf object.


  Commit: 2de16c3c66da2e9682a4f26277a6d6806130aa2b
      
https://github.com/Dolibarr/dolibarr/commit/2de16c3c66da2e9682a4f26277a6d6806130aa2b
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M htdocs/expensereport/class/expensereport.class.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5c24d2ee5e5a...2de16c3c66da