[Dolibarr-git] [Dolibarr/dolibarr] 121550: Fix Close bug #2814 JPEG photos are not displayed ...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 12155029279fe748da1ce78275739f38230f1639
      
https://github.com/Dolibarr/dolibarr/commit/12155029279fe748da1ce78275739f38230f1639
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Fix Close bug #2814 JPEG photos are not displayed in Product photos page


  Commit: 2d3ab3b658be95512a93c0791ae192387afc23fc
      
https://github.com/Dolibarr/dolibarr/commit/2d3ab3b658be95512a93c0791ae192387afc23fc
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/bank/virement.php
    M htdocs/core/lib/report.lib.php
    M htdocs/install/upgrade2.php
    M htdocs/product/liste.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/3.5' into bug-2814-2

Conflicts:
        ChangeLog


  Commit: fa8defa1bf71d2c4de07fa940251d52d1d170b6f
      
https://github.com/Dolibarr/dolibarr/commit/fa8defa1bf71d2c4de07fa940251d52d1d170b6f
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge pull request #3034 from marcosgdf/bug-2814-2

Fix #2814 JPEG photos are not displayed in Product photos page


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1fc471661743...fa8defa1bf71