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
..
admin	Merge pull request #10691 from aspangaro/develop	2019-02-27 02:18:20 +01:00
bookkeeping	PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket	2019-02-24 20:06:55 +01:00
class	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2019-03-02 18:30:17 +01:00
customer	fix : When comparing two booleans, it is generally considered safer to use the strict comparison operator.	2019-02-21 14:25:09 +01:00
expensereport	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
journal	PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket	2019-02-24 20:06:55 +01:00
supplier	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
tpl	Move my email to the new one	2019-01-28 21:39:22 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
index.php	Fix line feed	2019-02-20 05:05:26 +01:00