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 -04:00
..
ajax	Make some apps compatible	2012-06-11 19:07:51 +02:00
appinfo	Remove OC_App::register function	2012-05-31 13:01:30 +02:00
css	Make sure sharing and versions dropdowns come down in the same location for all files	2012-05-19 11:24:23 -04:00
js	Label the delete operation "unshare" for files in the "Shared" folder to reduce	2012-06-12 16:27:24 +02:00
l10n	update translations	2012-06-06 00:29:28 +02:00
templates	Removed some unessecary sanitizations	2012-06-11 19:20:48 +02:00
admin.php	Revert	2012-06-11 13:27:32 +02:00
download.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
index.php	Make some apps compatible	2012-06-11 19:07:51 +02:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00