[Dolibarr-git] [Dolibarr/dolibarr] 36630b: FIX Picto of project on dol_banner and box

[Laurent Destailleur]

  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 36630b94046af3f7b35c961632ab0d62bf8ef145
      
https://github.com/Dolibarr/dolibarr/commit/36630b94046af3f7b35c961632ab0d62bf8ef145
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M htdocs/core/boxes/box_project.php
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  FIX Picto of project on dol_banner and box

Conflicts:
        htdocs/core/boxes/box_project.php


  Commit: e2e76b40dacaca429caeabc3f648de8b56282678
      
https://github.com/Dolibarr/dolibarr/commit/e2e76b40dacaca429caeabc3f648de8b56282678
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M htdocs/core/boxes/box_project.php
    M htdocs/projet/list.php

  Log Message:
  -----------
  FIX list of projects

Conflicts:
        htdocs/core/boxes/box_project.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ea6daeb58b1b...e2e76b40daca