[Dolibarr-git] [Dolibarr/dolibarr] 45136d: Fix: documents dir not rename and delete

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 45136de6645b1fa61ee6cc396e026164dcdff728
      
https://github.com/Dolibarr/dolibarr/commit/45136de6645b1fa61ee6cc396e026164dcdff728
  Author: Regis Houssin <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M htdocs/resource/class/dolresource.class.php

  Log Message:
  -----------
  Fix: documents dir not rename and delete


  Commit: 5a81073cd876362253d85695ab48d1d39d4044e0
      
https://github.com/Dolibarr/dolibarr/commit/5a81073cd876362253d85695ab48d1d39d4044e0
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M htdocs/resource/class/dolresource.class.php

  Log Message:
  -----------
  Merge pull request #7308 from hregis/5.0_bug2

Fix: documents dir not rename and delete


  Commit: ac08dec2c356c0b1fe9a528b5f0290c54a0f4368
      
https://github.com/Dolibarr/dolibarr/commit/ac08dec2c356c0b1fe9a528b5f0290c54a0f4368
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M htdocs/compta/bank/index.php

  Log Message:
  -----------
  Avoid warnings


  Commit: ffb408f4403d8150ee425b7d5fb05905c7993819
      
https://github.com/Dolibarr/dolibarr/commit/ffb408f4403d8150ee425b7d5fb05905c7993819
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M htdocs/resource/class/dolresource.class.php

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


  Commit: f92129dcdb667eccb88f0657f912a31d061299a1
      
https://github.com/Dolibarr/dolibarr/commit/f92129dcdb667eccb88f0657f912a31d061299a1
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-03 (Sun, 03 Sep 2017)

  Changed paths:
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Fix packager to avoid symlinks into custom


  Commit: c108f11c01467e7f1db81a50465e54fa02a2abab
      
https://github.com/Dolibarr/dolibarr/commit/c108f11c01467e7f1db81a50465e54fa02a2abab
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-03 (Sun, 03 Sep 2017)

  Changed paths:
    M htdocs/resource/class/dolresource.class.php

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

Conflicts:
        build/makepack-dolibarr.pl
        htdocs/compta/bank/index.php


  Commit: 3108f5bf0da88e0308b85f6b0e58e64ba31872d9
      
https://github.com/Dolibarr/dolibarr/commit/3108f5bf0da88e0308b85f6b0e58e64ba31872d9
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-03 (Sun, 03 Sep 2017)

  Changed paths:
    M htdocs/admin/modules.php
    M htdocs/langs/en_US/main.lang
    M htdocs/margin/customerMargins.php
    M htdocs/projet/tasks.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/09e9254f354a...3108f5bf0da8