[Dolibarr-git] [Dolibarr/dolibarr] 338fc5: Fix: Bad unique key

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 338fc5f2f862f5f094d64bf0259ed15e8a7f8e0a
      
https://github.com/Dolibarr/dolibarr/commit/338fc5f2f862f5f094d64bf0259ed15e8a7f8e0a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M htdocs/install/mysql/tables/llx_c_type_resource.key.sql

  Log Message:
  -----------
  Fix: Bad unique key


  Commit: 3064aa21776a262da0cdbe051825b1eed0bc1f09
      
https://github.com/Dolibarr/dolibarr/commit/3064aa21776a262da0cdbe051825b1eed0bc1f09
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.key.sql
    M htdocs/install/mysql/tables/llx_c_type_resource.sql
    M htdocs/langs/en_US/products.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/document.php

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

Conflicts:
        htdocs/install/mysql/tables/llx_c_type_resource.key.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f1993e719fd0...3064aa21776a