Michael Gapczynski b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 ... Conflicts: apps/files_external/templates/settings.php lib/template.php		2012-06-13 15:17:46 +07:00
..
ajax	restore require once command for non app files	2012-04-18 17:49:50 +07:00
css	Fix remap dir for CSS minimizer	2012-06-05 18:09:32 +07:00
img	oc-657: icons for M$ office file types	2012-05-21 09:35:31 +07:00
js	fix potential xss in multiselect	2012-06-09 15:07:16 +07:00
l10n	update translations	2012-06-06 00:29:28 +07:00
lostpassword	urlencode link fort password reset (bug #970)	2012-06-13 17:22:28 +07:00
templates	Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127	2012-06-13 15:17:46 +07:00
minimizer.php	Load apps before minimizing the core css and js	2012-06-04 23:17:50 +07:00
strings.php	reuse OC_L10N objects	2012-04-14 16:44:15 +07:00