From: David A. Velasco Date: Fri, 10 Oct 2014 09:04:37 +0000 (+0200) Subject: Merge branch 'develop' into instant_upload_path_chooseable X-Git-Tag: oc-android-1.7.0_signed~141^2~6 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ca3e73065de93c9b25515587e6e1cf6be8365b79?ds=sidebyside Merge branch 'develop' into instant_upload_path_chooseable --- ca3e73065de93c9b25515587e6e1cf6be8365b79