Michael Gapczynski 4bf13adff2 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/addressbook.php apps/files_sharing/js/share.js apps/files_sharing/sharedstorage.php		2012-07-11 20:25:59 -04:00
..
ajax	Merge branch 'master' into share_api	2012-07-11 20:25:59 -04:00
css	Added text ACS warning to admin's user settings page, and corresponding CSS styles	2012-06-25 18:04:10 +01: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-07-11 20:25:59 -04:00
l10n	update translations	2012-06-06 00:29:28 +02:00
lostpassword	urlencode link fort password reset (bug #970)	2012-06-13 17:22:28 +02:00
templates	add x-webkit-speech to searchbox	2012-06-24 00:42:16 +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