[Dolibarr-git] [Dolibarr/dolibarr] 107594: ignore conf/conf.php file

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1075940e93fd2625ef8f2eb8e8d100910bd0f338
      
https://github.com/Dolibarr/dolibarr/commit/1075940e93fd2625ef8f2eb8e8d100910bd0f338
  Author: yassine belkaid <address@hidden>
  Date:   2015-12-05 (Sat, 05 Dec 2015)

  Changed paths:
    M htdocs/.gitignore

  Log Message:
  -----------
  ignore conf/conf.php file


  Commit: 8c2227430077912eda24e613af52bec65038be83
      
https://github.com/Dolibarr/dolibarr/commit/8c2227430077912eda24e613af52bec65038be83
  Author: yassine belkaid <address@hidden>
  Date:   2015-12-05 (Sat, 05 Dec 2015)

  Changed paths:
    M htdocs/holiday/define_holiday.php

  Log Message:
  -----------
  Fixed assigning exceptional leave for a user


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

  Changed paths:
    M htdocs/.gitignore
    M htdocs/holiday/define_holiday.php

  Log Message:
  -----------
  Merge pull request #4159 from belyas/develop

addLogCP and updateSoledCP methodes throwing warnings when assigning leave for 
a user


Compare: 
https://github.com/Dolibarr/dolibarr/compare/939a36428cbd...f73c059bc4e3