[Dolibarr-git] [Dolibarr/dolibarr] 38c770: FIX #7806

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 38c770ffb3eb90c7ecc49d916e2665b34632972b
      
https://github.com/Dolibarr/dolibarr/commit/38c770ffb3eb90c7ecc49d916e2665b34632972b
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M htdocs/user/class/api_users.class.php

  Log Message:
  -----------
  FIX #7806


  Commit: 4cbcf5189afbcfdc52e944f9288c456eee55e2f9
      
https://github.com/Dolibarr/dolibarr/commit/4cbcf5189afbcfdc52e944f9288c456eee55e2f9
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M htdocs/user/class/api_users.class.php

  Log Message:
  -----------
  FIX #7806


  Commit: 61798d1af007dfcdf1ef284d5e8546af479e3096
      
https://github.com/Dolibarr/dolibarr/commit/61798d1af007dfcdf1ef284d5e8546af479e3096
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M dev/dolibarr_changes.txt
    M htdocs/includes/parsedown/Parsedown.php

  Log Message:
  -----------
  FIX list of module not complete when module mb_strlen not available

Conflicts:
        dev/dolibarr_changes.txt


  Commit: 7d3325c08713133aa7af07a52c0385acebb6108e
      
https://github.com/Dolibarr/dolibarr/commit/7d3325c08713133aa7af07a52c0385acebb6108e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-25 (Sat, 25 Nov 2017)

  Changed paths:
    M dev/dolibarr_changes.txt
    M htdocs/user/class/api_users.class.php

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

Conflicts:
        dev/dolibarr_changes.txt
        htdocs/user/class/api_users.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/77509ee37a96...7d3325c08713