dolibarr/htdocs/user
Laurent Destailleur 9444e8d63d Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/admin/boxes.php
	htdocs/admin/ihm.php
	htdocs/core/lib/usergroups.lib.php
	htdocs/main.inc.php
2011-11-02 22:51:52 +01:00
..
class Fix: Try to fix trigger tha change password 2011-11-02 18:05:45 +01:00
group Security: Fix more security holes 2011-11-02 22:15:59 +01:00
clicktodial.php [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
fiche.php Security: A lot of security fixes 2011-11-02 20:17:55 +01:00
home.php Fix: avoid warning 2011-09-20 15:41:16 +00:00
index.php Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 2011-11-02 20:29:27 +01:00
info.php Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 2011-11-02 20:29:27 +01:00
ldap.php [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
logout.php avoid warning 2011-09-04 19:38:04 +00:00
note.php Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 2011-11-02 20:29:27 +01:00
param_ihm.php Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 2011-11-02 20:29:27 +01:00
passwordforgotten.php [task 189] Move Error* key from other.lang into errors.lang files 2011-10-29 23:52:05 +02:00
perms.php Security: A lot of security fixes 2011-11-02 20:17:55 +01:00