Michael Gapczynski e1bde1a78e Merge branch 'master' into sharing ... Conflicts: files/templates/index.php		2011-08-10 13:40:47 -04:00
..
contacts	Delete addressbooks of deleted users	2011-08-10 14:28:14 +02:00
files_imageviewer	show images on click in search results	2011-07-31 02:35:54 +02:00
files_publiclink	Merge branch 'master' into sharing	2011-08-09 10:42:50 -04:00
files_sharing	Fix shared list for files inside of shared folders	2011-08-10 13:38:58 -04:00
files_textviewer	work in new app management	2011-08-10 14:03:54 +02:00
media	make more strings translatable	2011-08-10 14:03:54 +02:00
user_ldap	dont use a different navigation page for settings stuff	2011-08-08 21:43:31 +02:00
user_openid	apps can now add their own forms to the Personal page	2011-08-08 23:46:52 +02:00
.gitkeep	apps are now stored in /apps	2011-04-16 09:46:58 +02:00