[Dolibarr-git] [Dolibarr/dolibarr] 70f732: Comment

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 70f7321d515c40b1adbc881f2dfee2561ff14b89
      
https://github.com/Dolibarr/dolibarr/commit/70f7321d515c40b1adbc881f2dfee2561ff14b89
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M 
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php

  Log Message:
  -----------
  Comment


  Commit: 94d3e6d3cdb4f72b79d5b07f292060e836fa8165
      
https://github.com/Dolibarr/dolibarr/commit/94d3e6d3cdb4f72b79d5b07f292060e836fa8165
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M htdocs/admin/contract.php
    A htdocs/contrat/admin/contract_extrafields.php
    M htdocs/core/lib/contract.lib.php
    A htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/contract/modules_contract.php
    M 
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
    M htdocs/langs/fr_FR/admin.lang

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

Conflicts:
        
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/07cba2d23213...94d3e6d3cdb4