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

Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php

2016-09-12 02:05:38 +02:00

..

adodbtime

Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context

2015-12-16 13:32:44 +01:00

ccampbell/chromephp

Fix dos and bom and end of line

2016-03-12 18:30:19 +01:00

ckeditor/ckeditor

Fix perm and CRLF

2016-05-18 16:26:15 +02:00

evalmath

…

fonts

…

fpdfi

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-12-13 16:09:09 +01:00

geoip

…

jquery

Merge remote-tracking branch 'origin/3.9' into 4.0

2016-07-16 19:54:57 +02:00

jsgantt

Revert "change jsgantt to jsGanttImproved"

2016-07-26 13:59:08 +02:00

jstz

better includes externel library

2016-03-18 10:56:55 +01:00

jszip

better includes externel library

2016-03-18 10:56:55 +01:00

mike42/escpos-php

Revert "Update escpos-php"

2016-05-18 13:18:55 +02:00

mobiledetect/mobiledetectlib

Fix dos and bom and end of line

2016-03-12 18:30:19 +01:00

nusoap/lib

Merge remote-tracking branch 'origin/3.7' into 3.8

2016-04-12 15:00:02 +02:00

OAuth

Debug Direct print module using the OAuth setup.

2015-11-06 01:33:49 +01:00

odtphp

Remove debug logs

2016-07-29 16:31:29 +02:00

php-iban

Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr

2015-11-11 19:03:36 +01:00

phpoffice/phpexcel

Merge remote-tracking branch 'origin/3.9' into 4.0

2016-07-16 19:54:57 +02:00

printipp

…

restler/framework/Luracast/Restler

FIX #5734

2016-09-12 00:09:46 +02:00

swiftmailer/lib

Fix perm and CRLF

2016-05-18 16:26:15 +02:00

tcpdi

FIX #4207

2015-12-27 18:46:21 +01:00

tecnickcom/tcpdf

Removed not required directories

2016-04-22 11:11:24 +02:00

index.html

…