[Dolibarr-git] [Dolibarr/dolibarr] b86839: Fix colspan

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b8683979029da4dd1b1b765c735b003b005d0cea
      
https://github.com/Dolibarr/dolibarr/commit/b8683979029da4dd1b1b765c735b003b005d0cea
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-21 (Mon, 21 Jan 2019)

  Changed paths:
    M htdocs/accountancy/admin/account.php

  Log Message:
  -----------
  Fix colspan


  Commit: 4ab19c25c8ea021e678b232f300b8f338e644681
      
https://github.com/Dolibarr/dolibarr/commit/4ab19c25c8ea021e678b232f300b8f338e644681
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-01-21 (Mon, 21 Jan 2019)

  Changed paths:
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  add missing global $conf in bonprelevement class


  Commit: 1da29fbed38d849bb83012abc4b744b92dbbf06c
      
https://github.com/Dolibarr/dolibarr/commit/1da29fbed38d849bb83012abc4b744b92dbbf06c
  Author: florian HENRY <address@hidden>
  Date:   2019-01-21 (Mon, 21 Jan 2019)

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

  Log Message:
  -----------
  fix php warning


  Commit: a928f3a9d75c70d06052b8fc6c1718798cebd727
      
https://github.com/Dolibarr/dolibarr/commit/a928f3a9d75c70d06052b8fc6c1718798cebd727
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-21 (Mon, 21 Jan 2019)

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

  Log Message:
  -----------
  Update dolresource.class.php


  Commit: 0df1d2e2f7bed29f62de682d667383c07145ddcd
      
https://github.com/Dolibarr/dolibarr/commit/0df1d2e2f7bed29f62de682d667383c07145ddcd
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-21 (Mon, 21 Jan 2019)

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

  Log Message:
  -----------
  Merge pull request #10384 from atm-florian/9.0

fix php warning


  Commit: 9c3a0bb14e63ea4fd79cdba289baba898071965c
      
https://github.com/Dolibarr/dolibarr/commit/9c3a0bb14e63ea4fd79cdba289baba898071965c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-21 (Mon, 21 Jan 2019)

  Changed paths:
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Merge pull request #10382 from frederic34/patch-2

add missing global $conf in bonprelevement class


  Commit: 6f553db93d0323d5725c253187f79192ce7eb448
      
https://github.com/Dolibarr/dolibarr/commit/6f553db93d0323d5725c253187f79192ce7eb448
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-21 (Mon, 21 Jan 2019)

  Changed paths:
    M htdocs/admin/system/filecheck.php

  Log Message:
  -----------
  Remove bad text


  Commit: a4017fa82315fea5f4a693ef2e758ff3970b72b8
      
https://github.com/Dolibarr/dolibarr/commit/a4017fa82315fea5f4a693ef2e758ff3970b72b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-21 (Mon, 21 Jan 2019)

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


  Commit: 3cf81d14e3ad7a8b2209e0a278976e6e05ccf0e8
      
https://github.com/Dolibarr/dolibarr/commit/3cf81d14e3ad7a8b2209e0a278976e6e05ccf0e8
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-21 (Mon, 21 Jan 2019)

  Changed paths:
    M htdocs/admin/system/filecheck.php

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


  Commit: 0ae3aeff12a6d20660ead4bbfe28d8500e8776bb
      
https://github.com/Dolibarr/dolibarr/commit/0ae3aeff12a6d20660ead4bbfe28d8500e8776bb
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-21 (Mon, 21 Jan 2019)

  Changed paths:
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/resource/class/dolresource.class.php

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


  Commit: fbf5a1c0563c129ccc1647340b29a5e628a764f4
      
https://github.com/Dolibarr/dolibarr/commit/fbf5a1c0563c129ccc1647340b29a5e628a764f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-01-21 (Mon, 21 Jan 2019)

  Changed paths:
    M htdocs/admin/system/filecheck.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/resource/class/dolresource.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8284bd0577a6...fbf5a1c0563c
      **NOTE:** This service has 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.