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
..
ajax	Merge branch 'master' into share_api	2012-08-14 10:22:13 -04:00
css	Position appsettings fixed and load it in dynamically added element.	2012-08-12 18:42:54 +02:00
img	oc-657: icons for M$ office file types	2012-05-21 09:35:31 +02:00
js	Merge branch 'master' into share_api	2012-08-14 10:22:13 -04:00
l10n	[tx-robot] updated from transifex	2012-08-12 02:04:58 +02:00
lostpassword	fix for bug #1295, don't escape password reset link	2012-07-27 15:35:36 +02:00
templates	Use OC_Util::displayLoginPage and cleanup the function	2012-08-10 11:43:04 +02:00
minimizer.php	Use TemplateLayout functions for finding js and css files in minimizer	2012-06-18 15:40:48 +02:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00