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

Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	htdocs/expedition/list.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/user/class/user.class.php

2015-05-16 17:09:42 +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

user.class.php

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

2015-05-16 17:09:42 +02:00

usergroup.class.php

FIXME that are not bug are replaced with TODO

2015-04-12 04:01:28 +02:00