dolibarr/htdocs/includes
Laurent Destailleur dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
2015-12-18 21:20:12 +01:00
..
adodbtime
chromephp
ckeditor
evalmath
fonts
fpdfi
geoip
jquery
jsgantt
jstz
mobiledetect
nusoap/lib
odtphp
php-iban
phpexcel
printipp
restler
tcpdf
tcpdi
index.html