jfefe 190ee35e86 Merge branch 'develop' into api_rest ... Conflicts: htdocs/user/card.php htdocs/user/class/user.class.php		2015-06-15 14:29:34 +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 branch 'develop' into api_rest	2015-06-15 14:29:34 +02:00
usergroup.class.php	Qual: added deprecation hinting	2015-06-01 11:00:11 +02:00