[Dolibarr-git] [Dolibarr/dolibarr] 1fd712: Fix help

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1fd712d7122544e9551208f70da7ac08687ddb0e
      
https://github.com/Dolibarr/dolibarr/commit/1fd712d7122544e9551208f70da7ac08687ddb0e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M scripts/invoices/rebuild_merge_pdf.php

  Log Message:
  -----------
  Fix help


  Commit: 725e57b73e559da93757b98e043a9b0392642f0b
      
https://github.com/Dolibarr/dolibarr/commit/725e57b73e559da93757b98e043a9b0392642f0b
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M htdocs/admin/ihm.php
    M htdocs/core/lib/pdf.lib.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/14b667c9f177...725e57b73e55