[Dolibarr-git] [Dolibarr/dolibarr] 848f70: Fix bad merge

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 848f70e02638494346336b7defde28eda9088988
      
https://github.com/Dolibarr/dolibarr/commit/848f70e02638494346336b7defde28eda9088988
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M htdocs/theme/md/style.css.php
    M htdocs/user/index.php

  Log Message:
  -----------
  Fix bad merge


  Commit: 00bf4bba13d454873be4f101dbb514eb9c729cd7
      
https://github.com/Dolibarr/dolibarr/commit/00bf4bba13d454873be4f101dbb514eb9c729cd7
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M htdocs/user/index.php

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

Conflicts:
        htdocs/user/index.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b8dd7fb9588b...00bf4bba13d4