Michael Gapczynski 1aa89b7cbb Merge branch 'master' into sharing ... Conflicts: files/css/files.css lib/base.php		2011-08-07 15:56:26 -04:00
..
contacts	Small details in contacts	2011-08-06 23:29:25 +02:00
files_imageviewer
files_publiclink	Merge branch 'master' into sharing	2011-08-07 15:56:26 -04:00
files_sharing	Sharing dropdown changes: show users that have a parent folder shared with them and add the ability to change permissions	2011-08-07 15:20:57 -04:00
files_textviewer	selecting a text file from the search results now activates the text viewer	2011-08-03 00:30:21 +02:00
media	fix some issues with browsers not supporting html5 localStorage	2011-08-06 10:08:26 +02:00
user_ldap
user_openid	move openid settings to Personal	2011-08-06 10:08:26 +02:00
.gitkeep