Laurent Destailleur a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php

2019-03-02 18:30:17 +01:00

..

apache

Work on websiteaccounts

2017-11-03 13:25:49 +01:00

codesniffer

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2019-03-02 18:30:17 +01:00

codetemplates

…

multitail

…

nginx

Complete sample of setup files

2016-12-23 01:25:40 +01:00

phpunit

…

security

…

xdebug

…