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

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dbb9caa196f61f7bc97c0bc7b3fdf44319199dff
      
https://github.com/Dolibarr/dolibarr/commit/dbb9caa196f61f7bc97c0bc7b3fdf44319199dff
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-01-11 (Thu, 11 Jan 2018)

  Changed paths:
    M ChangeLog

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


  Commit: c947502efa8d8fbbe1a9800c3bcf2956578c504a
      
https://github.com/Dolibarr/dolibarr/commit/c947502efa8d8fbbe1a9800c3bcf2956578c504a
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-01-13 (Sat, 13 Jan 2018)

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

  Log Message:
  -----------
  Fix typo


  Commit: 9f6118ed5271f3763efc3a6fff77c48f3e11a0a5
      
https://github.com/Dolibarr/dolibarr/commit/9f6118ed5271f3763efc3a6fff77c48f3e11a0a5
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-01-14 (Sun, 14 Jan 2018)

  Changed paths:
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/db/DoliDB.class.php
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Code comments


  Commit: f0d6099e5fe88f5059d3f8b8b3780cced020f01e
      
https://github.com/Dolibarr/dolibarr/commit/f0d6099e5fe88f5059d3f8b8b3780cced020f01e
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-01-14 (Sun, 14 Jan 2018)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/db/DoliDB.class.php
    M htdocs/core/lib/functions.lib.php

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

Conflicts:
        htdocs/core/db/DoliDB.class.php
        htdocs/core/lib/functions.lib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/debc75813491...f0d6099e5fe8