From: masensio Date: Tue, 4 Feb 2014 12:31:30 +0000 (+0100) Subject: Merge branch 'share_link_show_shared_files' into share_link__unshare_file X-Git-Tag: oc-android-1.5.5~35^2~29 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/09bb7bce234cf9fc22d23a598ab4f9aec46909ec?hp=-c Merge branch 'share_link_show_shared_files' into share_link__unshare_file --- 09bb7bce234cf9fc22d23a598ab4f9aec46909ec