Michael Gapczynski 78cd1153f0 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php		2012-08-09 11:38:22 -04:00
..
ajax	Fix warnings and better styling	2012-08-07 23:29:56 +02:00
css	Fix scrollbar issue. Fixes oc-1414	2012-08-04 23:30:28 +00:00
img	oc-657: icons for M$ office file types	2012-05-21 09:35:31 +02:00
js	Fix issues with hiding and showing dropdown	2012-08-08 17:50:09 -04:00
l10n	[tx-robot] updated from transifex	2012-08-07 02:07:50 +02:00
lostpassword	fix for bug #1295, don't escape password reset link	2012-07-27 15:35:36 +02:00
templates	Small changes to allow updating main menu dynamically.	2012-08-05 01:42:17 +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