[Dolibarr-git] [Dolibarr/dolibarr] 495ba0: Fix: Slurp, database corruption due to missing uni...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 495ba00cb63b73b496ed3c7f5751102c14303afd
      
https://github.com/Dolibarr/dolibarr/commit/495ba00cb63b73b496ed3c7f5751102c14303afd
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-02 (Fri, 02 Dec 2016)

  Changed paths:
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    A htdocs/install/mysql/tables/llx_expensereport.key.sql

  Log Message:
  -----------
  Fix: Slurp, database corruption due to missing unique key on main key.


  Commit: 61c77467ec02dda744ef15de82a28ea7adb19bfb
      
https://github.com/Dolibarr/dolibarr/commit/61c77467ec02dda744ef15de82a28ea7adb19bfb
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-02 (Fri, 02 Dec 2016)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php

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


  Commit: 33139dd57abc8b8ab02ffc4f0c0c254d826051b8
      
https://github.com/Dolibarr/dolibarr/commit/33139dd57abc8b8ab02ffc4f0c0c254d826051b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-02 (Fri, 02 Dec 2016)

  Changed paths:
    M htdocs/cache.manifest
    R htdocs/disabled.php
    A htdocs/public/notice.php
    R htdocs/public/offline.php

  Log Message:
  -----------
  Fix missing translation of page "disabled" and "offline".


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ae185105d64d...33139dd57abc