Bart Visscher b483f2aab8 Merge branch 'master' into routing ... Conflicts: apps/contacts/js/contacts.js apps/contacts/lib/search.php apps/files_archive/js/archive.js apps/gallery/lib/tiles.php apps/gallery/templates/index.php lib/ocs.php		2012-08-30 21:49:28 +02:00
..
files	Merge branch 'master' into routing	2012-08-30 21:49:28 +02:00
files_encryption	Whitespace fixes in apps	2012-08-29 20:29:43 +02:00
files_external	Space before tab fixes	2012-08-29 20:34:44 +02:00
files_sharing	Fix filesystem setup for shared public link with logged in user	2012-08-29 21:35:55 +02:00
files_versions	Space before tab fixes	2012-08-29 20:34:44 +02:00
user_ldap	Space before tab fixes	2012-08-29 20:34:44 +02:00
user_webdavauth	Remove php close at end of file	2012-08-29 20:29:43 +02:00
.gitkeep	apps are now stored in /apps	2011-04-16 09:46:58 +02:00