Laurent Destailleur f58da0fa73 Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	htdocs/langs/fr_FR/main.lang

2014-08-01 02:05:38 +02:00

..

adodbtime

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

ckeditor

Fix: missing skin.js

2014-07-31 11:15:30 +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

License violation: Missing source on min file.

2014-05-27 00:26:53 +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

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

2014-05-07 19:30:19 +02:00

phpexcel

Cannot redeclare getmypid()

2014-07-31 10:21:47 +02:00

printipp

…

tcpdf

Cannot redeclare getmypid()

2014-07-31 10:21:47 +02: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