[Dolibarr/dolibarr] a2a96f: # WARNING: head commit changed in the meantime

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a2a96f879615171292a4bd49db9ff2b7076ff02e
      
https://github.com/Dolibarr/dolibarr/commit/a2a96f879615171292a4bd49db9ff2b7076ff02e
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-12-01 (Sun, 01 Dec 2019)

  Changed paths:
    M htdocs/comm/propal/card.php
    M htdocs/product/card.php

  Log Message:
  -----------
  # WARNING: head commit changed in the meantime

Restore file for travis


  Commit: d338a054eb378900421d6e1c451df79bf11c0408
      
https://github.com/Dolibarr/dolibarr/commit/d338a054eb378900421d6e1c451df79bf11c0408
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-12-01 (Sun, 01 Dec 2019)

  Changed paths:
    M dev/dolibarr_changes.txt
    M htdocs/bom/class/bom.class.php
    M htdocs/core/lib/project.lib.php
    M htdocs/includes/tecnickcom/tcpdf/tcpdf.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/takepos/css/pos.css
    M htdocs/takepos/takepos.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/3c328153bb83...d338a054eb37