[Dolibarr-git] [Dolibarr/dolibarr] 365639: Prepare 6.0.5

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 365639a6c00422d79db569e75e46014a42e0b5f1
      
https://github.com/Dolibarr/dolibarr/commit/365639a6c00422d79db569e75e46014a42e0b5f1
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 6.0.5


  Commit: 340287f073686ace946816efe8f89e9cf50654fc
      
https://github.com/Dolibarr/dolibarr/commit/340287f073686ace946816efe8f89e9cf50654fc
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-12-05 (Tue, 05 Dec 2017)

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

  Log Message:
  -----------
  FIX #7903

Conflicts:
        htdocs/holiday/class/holiday.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/44e5566ee58d...340287f07368