Laurent Destailleur 3844d4e6f7 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	ChangeLog
	htdocs/core/boxes/box_activity.php
	htdocs/fourn/commande/card.php
	htdocs/user/card.php

2015-03-23 15:16:37 +01:00

..

.gitignore

Exclude conf.php file from git

2013-08-10 13:02:13 +02:00

.htaccess

…

conf.php.example

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

2015-03-23 15:16:37 +01: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

phpinfo.php

Mise en place de l'initialisation de la base avec PDO SQlite

2015-02-25 09:04:11 +01:00