Laurent Destailleur 23562a01ab Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_US/stocks.lang

2015-02-16 20:59:04 +01:00

..

doctemplates

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

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

lib

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

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

mssql

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

2014-11-05 16:37:07 +01:00

mysql

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

2015-02-16 20:59:04 +01:00

pgsql

Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7

2014-11-22 15:30:37 +01:00

check.php

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

2015-02-15 19:51:49 +01:00

default.css

Prepare 3.8 dev

2014-12-03 17:06:44 +01:00

etape1.php

Style for install match css of login.

2014-10-09 13:47:40 +02:00

etape2.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

etape4.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

etape5.php

Fix: W3C table with no tr

2014-12-03 17:16:38 +01:00

fileconf.php

Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for

2014-08-01 00:53:29 +02:00

inc.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

index.php

Replace <center> tags

2014-11-25 20:13:43 +01:00

phpinfo.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

repair.php

Replace <center> tags

2014-11-25 20:13:43 +01:00

robots.txt

…

upgrade2.php

Fix: The filter into event views on user must be done on assigned

2015-01-15 02:06:04 +01:00

upgrade.php

Lock 5.5.40

2015-02-15 23:39:30 +01:00