[Dolibarr-git] [Dolibarr/dolibarr] ce3f45: Debug of doliwamp for 4.0

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ce3f45c2a270a5319713a12031488baf95ce4797
      
https://github.com/Dolibarr/dolibarr/commit/ce3f45c2a270a5319713a12031488baf95ce4797
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-03 (Sun, 03 Jul 2016)

  Changed paths:
    M build/exe/doliwamp/dolibarr.conf.install
    M build/exe/doliwamp/doliwamp.iss
    M build/exe/doliwamp/httpd.conf.install
    M build/exe/doliwamp/install_services.bat.install
    M build/exe/doliwamp/phpmyadmin.conf.install
    M build/exe/doliwamp/uninstall_services.bat.install
    M dev/security/htaccess.txt

  Log Message:
  -----------
  Debug of doliwamp for 4.0


  Commit: 32acdaecc1aef71bd09c5064adea45bbae3e3ca3
      
https://github.com/Dolibarr/dolibarr/commit/32acdaecc1aef71bd09c5064adea45bbae3e3ca3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-03 (Sun, 03 Jul 2016)

  Changed paths:
    M htdocs/accountancy/class/accountancycategory.class.php
    M htdocs/core/boxes/box_actions.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b654c7d6fe93...32acdaecc1ae