Commit Graph

4 Commits

Author SHA1 Message Date
Regis Houssin
0c8e4b8f1b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/user/index.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
2011-11-02 20:29:27 +01:00
Regis Houssin
921a379740 Fix: security 2011-11-02 20:24:51 +01:00
Laurent Destailleur
e6d27e0731 Doxygen 2011-11-02 14:15:44 +01:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00