Laurent Destailleur b1add3f9df Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/propal/class/propal.class.php
	htdocs/contrat/class/contrat.class.php

2013-09-13 09:32:41 +02:00

..

adodbtime

…

ckeditor

Merge remote-tracking branch 'origin/3.4' into develop

2013-09-13 09:32:41 +02:00

fonts

…

fpdfi

Fix: Permissions on files

2013-08-06 00:36:21 +02:00

geoip

Normalized EOL

2013-07-01 12:00:42 +02:00

jquery

crlf to lf

2013-09-12 14:24:51 +02:00

jsgantt

Merge remote-tracking branch 'origin/3.4' into develop

2013-09-11 23:12:47 +02:00

nusoap/lib

Replaced PHP 5.5 deprecated call in external library

2013-09-11 15:00:35 +02:00

odtphp

Normalized EOL

2013-07-01 12:00:42 +02:00

phpexcel

Normalized EOL

2013-07-01 12:00:42 +02:00

printipp

Print IPP lib

2013-03-08 11:17:46 +01:00

tcpdf

Fix: Permissions on files

2013-08-06 00:36:21 +02:00

index.php

…