Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api ... Conflicts: lib/group.php lib/group/backend.php lib/group/database.php lib/group/interface.php lib/public/user.php lib/user.php lib/user/backend.php lib/user/database.php lib/user/interface.php		2012-08-14 10:22:13 -04:00
..
vcategories	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
appconfig.php	Added XSRF check	2012-08-10 00:09:00 +02:00
share.php	Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor...	2012-08-12 14:49:41 -04:00
translations.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00