[Dolibarr-git] [Dolibarr/dolibarr] 18f4ea: Update conf template

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 18f4eabbdf7ddfef8aafa4a62c572ef910343a30
      
https://github.com/Dolibarr/dolibarr/commit/18f4eabbdf7ddfef8aafa4a62c572ef910343a30
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-04-06 (Sun, 06 Apr 2014)

  Changed paths:
    M htdocs/conf/conf.php.example

  Log Message:
  -----------
  Update conf template


  Commit: 5aee7131afd73ad00ecbd8c4ac135c5d4f781403
      
https://github.com/Dolibarr/dolibarr/commit/5aee7131afd73ad00ecbd8c4ac135c5d4f781403
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-04-06 (Sun, 06 Apr 2014)

  Changed paths:
    M htdocs/adherents/card_subscriptions.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/paypal.lang
    M htdocs/public/paybox/paymentok.php
    M htdocs/public/paypal/paymentok.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b77e068a72bb...5aee7131afd7