[Dolibarr-git] [Dolibarr/dolibarr] 4c21ad: FIX: dol_delete_file must work in a context withou...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4c21ad4e4e331c64bebcce76da018f5cd49dd883
      
https://github.com/Dolibarr/dolibarr/commit/4c21ad4e4e331c64bebcce76da018f5cd49dd883
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

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

  Log Message:
  -----------
  FIX: dol_delete_file must work in a context without db handler loaded

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


  Commit: 30b04c0d3dfd54d6ee734a211e5c171bf0beb399
      
https://github.com/Dolibarr/dolibarr/commit/30b04c0d3dfd54d6ee734a211e5c171bf0beb399
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

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

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

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


  Commit: 84471b70cf717b283d373c47db04e3ae884b30cc
      
https://github.com/Dolibarr/dolibarr/commit/84471b70cf717b283d373c47db04e3ae884b30cc
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1671c8b6cc1d...84471b70cf71
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.