From: masensio Date: Fri, 20 Mar 2015 13:55:48 +0000 (+0100) Subject: Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop X-Git-Tag: oc-android-1.7.1_signed^2~9^2~5 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c0da8a93f24f4f87256e71c32f3c2a300d22e62f?ds=inline;hp=--cc Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop --- c0da8a93f24f4f87256e71c32f3c2a300d22e62f