Michael Gapczynski 94ce8f2168 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js		2012-07-31 15:00:04 -04:00
..
ajax	Merge branch 'master' into share_api	2012-07-31 15:00:04 -04:00
css	Tweak appearance of undo delete notification	2012-07-29 18:02:08 -04:00
img	oc-657: icons for M$ office file types	2012-05-21 09:35:31 +02:00
js	Give share with search focus when sharing dropdown appears	2012-07-31 14:48:19 -04:00
l10n	[tx-robot] updated from transifex	2012-07-30 02:05:41 +02:00
lostpassword	fix for bug #1295, don't escape password reset link	2012-07-27 15:35:36 +02:00
templates	CSRF protection for eventsource	2012-07-22 16:37:49 +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