[Dolibarr-git] [Dolibarr/dolibarr] 2b55fb: Standardize substition keys.

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2b55fb81b9fdf9e357e63ee331c1b8994d8a8f9c
      
https://github.com/Dolibarr/dolibarr/commit/2b55fb81b9fdf9e357e63ee331c1b8994d8a8f9c
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-13 (Fri, 13 Oct 2017)

  Changed paths:
    M ChangeLog
    M htdocs/admin/mails.php
    M htdocs/admin/mails_emailing.php
    M htdocs/comm/mailing/card.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/langs/en_US/other.lang
    M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  Standardize substition keys.


  Commit: 0ac33d46c297029f2f61e02f98ecaf8637a69536
      
https://github.com/Dolibarr/dolibarr/commit/0ac33d46c297029f2f61e02f98ecaf8637a69536
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-13 (Fri, 13 Oct 2017)

  Changed paths:
    M htdocs/accountancy/admin/index.php
    M htdocs/api/class/api_documents.class.php
    M htdocs/core/tpl/admin_extrafields_view.tpl.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/fr_FR/companies.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4b3d84cf026b...0ac33d46c297