From: David A. Velasco Date: Wed, 22 Jan 2014 12:25:22 +0000 (+0100) Subject: Merge branch 'share_link_show_shared_files' into share_link__new_share X-Git-Tag: oc-android-1.5.5~35^2~43^2~9 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/66f775f0f7a4882483ed60ce797a4d0a4db24659?hp=--cc Merge branch 'share_link_show_shared_files' into share_link__new_share --- 66f775f0f7a4882483ed60ce797a4d0a4db24659