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
..
album.php	fixed wrong function call	2012-06-06 10:40:22 +02:00
hooks_handlers.php	remove old code	2012-06-08 21:44:32 +02:00
images_utils.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
managers.php	Gallery: remove extra include of lib/base.php	2012-06-11 20:34:06 +02:00
photo.php	fixed wrong function call	2012-06-06 10:40:22 +02:00
scanner.php	fixed wrong function call	2012-06-06 10:40:22 +02:00
sharing.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
tiles.php	Make some apps compatible	2012-06-11 19:07:51 +02:00
tiles_test.php	git status	2012-06-06 22:13:48 +02:00