Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
authormasensio <masensio@solidgear.es>
Mon, 16 Mar 2015 10:15:27 +0000 (11:15 +0100)
committermasensio <masensio@solidgear.es>
Mon, 16 Mar 2015 10:15:27 +0000 (11:15 +0100)
commit876204faf03075e286cf550b3bfba86d3f5a1419
tree86b07692731f063afbd1cd466c55c0c14330975d
parent7f6c5bd3b2d0396a838168cd5e3f622b16239e67
parent3c55631bee2f32542f4efb24ea57a7d19f92587f
Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
res/layout/uploader_layout.xml
res/values/strings.xml
src/com/owncloud/android/ui/activity/Uploader.java