[Dolibarr-git] [Dolibarr/dolibarr] c30dcf: Show info when link has been deleted

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c30dcf78cb329dae0711f734ecc0c061390d95f5
      
https://github.com/Dolibarr/dolibarr/commit/c30dcf78cb329dae0711f734ecc0c061390d95f5
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M htdocs/comm/action/card.php

  Log Message:
  -----------
  Show info when link has been deleted


  Commit: bb2a9f9d0e71155cd331f9b34fcc3ea3713301b8
      
https://github.com/Dolibarr/dolibarr/commit/bb2a9f9d0e71155cd331f9b34fcc3ea3713301b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M htdocs/admin/agenda_other.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/shipment.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/tables/llx_expedition.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/projects.lang
    A htdocs/langs/fr_NC/projects.lang
    A htdocs/langs/fr_NC/sendings.lang
    M htdocs/projet/element.php

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


  Commit: 807c77f754f922133e78c9c93c392a0b8eeded89
      
https://github.com/Dolibarr/dolibarr/commit/807c77f754f922133e78c9c93c392a0b8eeded89
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M htdocs/admin/agenda_other.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/index.php
    M htdocs/core/class/conf.class.php
    M htdocs/societe/ajax/company.php

  Log Message:
  -----------
  Fix inconsistent options


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d1c4439a0fa0...807c77f754f9