[Dolibarr-git] [Dolibarr/dolibarr] 1b04ea: Merge log with events tabs

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1b04eabf1facf33b7ccb4ec219cd942143685fb8
      
https://github.com/Dolibarr/dolibarr/commit/1b04eabf1facf33b7ccb4ec219cd942143685fb8
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

  Changed paths:
    M composer.json
    M htdocs/admin/security_file.php
    M htdocs/commande/card.php
    M htdocs/commande/contact.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/expedition/shipment.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/societe/agenda.php
    R htdocs/societe/info.php

  Log Message:
  -----------
  Merge log with events tabs