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

Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php

2016-09-19 14:05:16 +02:00

..

doctemplates

A more complete example of odt template

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

lib

…

mssql

…

mysql

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

2016-09-19 14:05:16 +02:00

pgsql

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

2016-07-06 15:11:29 +02:00

sqlite3

…

.gitignore

Exclude file from sources. It is generated when building package.

2015-10-11 19:47:47 +02:00

check.php

Fix: we still need gd

2016-08-05 04:45:05 +02:00

default.css

Install style match application style

2016-01-08 22:23:57 +01:00

fileconf.php

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

2016-09-09 09:32:14 +02:00

inc.php

Merge branch 'remove-mysql-driver' of

2016-08-05 13:12:43 +02:00

index.php

New: Improved forced install process

2016-07-20 14:22:35 +02:00

install.forced.sample.php

New: Improved forced install process

2016-07-20 14:22:35 +02:00

phpinfo.php

…

repair.php

Merge branch 'remove-mysql-driver' of

2016-08-05 13:12:43 +02:00

robots.txt

…

step1.php

New: Improved forced install process

2016-07-20 14:22:35 +02:00

step2.php

Merge branch 'remove-mysql-driver' of

2016-08-05 13:12:43 +02:00

step4.php

Prevent PHP notice on unitialized variables.

2016-07-23 02:01:49 +02:00

step5.php

New: Improved forced install process

2016-07-20 14:22:35 +02:00

upgrade2.php

Revert "Fix migration for entity in remise table"

2016-08-31 12:52:25 +02:00

upgrade.php

Merge branch 'remove-mysql-driver' of

2016-08-05 13:12:43 +02:00