[Dolibarr-git] [Dolibarr/dolibarr] a9bfe0: Fix: some problems with medias in multicompany (ba...

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a9bfe0f48f2502ad3ee0c22a998c8b87292eec31
      
https://github.com/Dolibarr/dolibarr/commit/a9bfe0f48f2502ad3ee0c22a998c8b87292eec31
  Author: Regis Houssin <address@hidden>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

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

  Log Message:
  -----------
  Fix: some problems with medias in multicompany (backport 6.0 commit 
762b4eb8768a0b09d69c06529566954f7efbc1c0)


  Commit: 356f36c5bf543f37355f8b0f09024a9ddf414e44
      
https://github.com/Dolibarr/dolibarr/commit/356f36c5bf543f37355f8b0f09024a9ddf414e44
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

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

  Log Message:
  -----------
  Merge pull request #7851 from atm-gauthier/5.0_backport_feature

Fix: some problems with medias in multicompany (backport 6.0 commit 
762b4eb8768a0b09d69c06529566954f7efbc1c0)


  Commit: 2493c2468d0fa9e6a738fbce2d6a3173c0b61366
      
https://github.com/Dolibarr/dolibarr/commit/2493c2468d0fa9e6a738fbce2d6a3173c0b61366
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-24 (Fri, 24 Nov 2017)

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

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

Conflicts:
        htdocs/core/class/conf.class.php
        htdocs/core/lib/files.lib.php


  Commit: 07cd1fb3c20371d2f08791adbb5e50d28c854406
      
https://github.com/Dolibarr/dolibarr/commit/07cd1fb3c20371d2f08791adbb5e50d28c854406
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-24 (Fri, 24 Nov 2017)

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

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/306dcf3600f4...07cd1fb3c203