From: masensio Date: Mon, 23 Mar 2015 13:29:25 +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~3 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ae440a5fa740fcd2950bdccabf4a1bd0a72c1751?ds=inline Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop --- ae440a5fa740fcd2950bdccabf4a1bd0a72c1751