[Dolibarr-git] [Dolibarr/dolibarr] 34987d: Exclude conf.php file from git

[Laurent Destailleur]

  Branch: refs/heads/3.3_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 34987d3e8b2802d814f33dd9bb85c1f788f6351f
      
https://github.com/Dolibarr/dolibarr/commit/34987d3e8b2802d814f33dd9bb85c1f788f6351f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M htdocs/conf/.gitignore

  Log Message:
  -----------
  Exclude conf.php file from git


  Commit: 49e38e1263a4d637f9cee967e80372899817ce36
      
https://github.com/Dolibarr/dolibarr/commit/49e38e1263a4d637f9cee967e80372899817ce36
  Author: Grand Philippe <address@hidden>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  fix some trad


  Commit: dd3d0ad9acbde03a4a13747184ee67fa8dfb1d5b
      
https://github.com/Dolibarr/dolibarr/commit/dd3d0ad9acbde03a4a13747184ee67fa8dfb1d5b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Merge pull request #1181 from grandoc/3.3

fix some trad


  Commit: abb873c962efe9c8cd7565aed85bc390e2877e9b
      
https://github.com/Dolibarr/dolibarr/commit/abb873c962efe9c8cd7565aed85bc390e2877e9b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-24 (Sat, 24 Aug 2013)

  Changed paths:
    M htdocs/conf/.gitignore
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.3_backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6db131041e01...abb873c962ef