[Dolibarr-git] [Dolibarr/dolibarr] 28024d: Merge branch '9.0' of address@hidden:Dolibarr/doli...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 28024d5cd192155b0571c8da6afd8f4ced5d7d25
      
https://github.com/Dolibarr/dolibarr/commit/28024d5cd192155b0571c8da6afd8f4ced5d7d25
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-24 (Mon, 24 Jun 2019)

  Changed paths:
    M htdocs/core/actions_massactions.inc.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/user/card.php

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

Conflicts:
        htdocs/core/actions_massactions.inc.php


  Commit: 293b3987e8d3b02edf5c013613eca6e39fd29c92
      
https://github.com/Dolibarr/dolibarr/commit/293b3987e8d3b02edf5c013613eca6e39fd29c92
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-24 (Mon, 24 Jun 2019)

  Changed paths:
    M htdocs/theme/eldy/global.inc.php

  Log Message:
  -----------
  CSS


  Commit: cc64e0fe528f1598724e36da82b5d132ba7beab6
      
https://github.com/Dolibarr/dolibarr/commit/cc64e0fe528f1598724e36da82b5d132ba7beab6
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-24 (Mon, 24 Jun 2019)

  Changed paths:
    M htdocs/theme/eldy/global.inc.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/609eefaf08b5...cc64e0fe528f