Michael Gapczynski 2af0269eb9 Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing ... Conflicts: apps/files_sharing/js/share.js		2011-08-11 11:15:17 -04:00
..
list.js	Add support for user autocomplete	2011-07-24 15:47:37 -04:00
share.js	Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing	2011-08-11 11:15:17 -04:00