From: masensio Date: Tue, 24 Mar 2015 11:26:24 +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~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/898957f9e758b12b418801754bb225d94e51317e?ds=inline;hp=--cc Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop --- 898957f9e758b12b418801754bb225d94e51317e