From: masensio Date: Thu, 16 Jan 2014 17:46:07 +0000 (+0100) Subject: Merge branch 'develop' into share_link_show_shared_files X-Git-Tag: oc-android-1.5.5~35^2~65 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e6bf6968fa081d06d75af8d7a7625f0b79375df3?ds=inline;hp=--cc Merge branch 'develop' into share_link_show_shared_files --- e6bf6968fa081d06d75af8d7a7625f0b79375df3