[Dolibarr-git] [Dolibarr/dolibarr] 20c50e: Start 6.0.8

[Laurent Destailleur]

  Branch: refs/heads/7.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 20c50e809d848a335195df76d54b82964ebd7e18
      
https://github.com/Dolibarr/dolibarr/commit/20c50e809d848a335195df76d54b82964ebd7e18
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-06 (Sun, 06 May 2018)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Start 6.0.8


  Commit: 630e38072b84c68a3a4dd5ebc927e78f7b11ac74
      
https://github.com/Dolibarr/dolibarr/commit/630e38072b84c68a3a4dd5ebc927e78f7b11ac74
  Author: florian HENRY <address@hidden>
  Date:   2018-05-15 (Tue, 15 May 2018)

  Changed paths:
    M htdocs/projet/contact.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  fix SQL and add hook


  Commit: 2e9f5d1c9442da0055a1720264286da11327e574
      
https://github.com/Dolibarr/dolibarr/commit/2e9f5d1c9442da0055a1720264286da11327e574
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M htdocs/projet/contact.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge pull request #8798 from atm-florian/6.0

fix SQL and add hook


  Commit: a450f99e8a6eba304c492d66a0d60e2426a8d9ae
      
https://github.com/Dolibarr/dolibarr/commit/a450f99e8a6eba304c492d66a0d60e2426a8d9ae
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M htdocs/projet/contact.php
    M htdocs/projet/element.php

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

Conflicts:
        htdocs/filefunc.inc.php


  Commit: fa7f81c82861dfa66713838fc3bda2ade4bdccda
      
https://github.com/Dolibarr/dolibarr/commit/fa7f81c82861dfa66713838fc3bda2ade4bdccda
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-18 (Fri, 18 May 2018)

  Changed paths:
    M htdocs/accountancy/admin/journals_list.php
    M htdocs/projet/tasks/contact.php
    M htdocs/projet/tasks/time.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/162d27188417...fa7f81c82861
      **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.