Merge remote-tracking branch 'upstream/develop' into uploadNewFolder
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 8 Jan 2015 21:41:41 +0000 (22:41 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 8 Jan 2015 21:41:41 +0000 (22:41 +0100)
commitd54345d0403a4ea2214b793b24ba0e821ea1339c
treed3b6d8c7e5bf6ca5ea6924751c3336055ced4beb
parent6b742de58e881bed9bd578985f374292402f880f
parent2fb89a92389c2c0d2cd37923cad904ee30847359
Merge remote-tracking branch 'upstream/develop' into uploadNewFolder

Conflicts:
src/com/owncloud/android/ui/activity/Uploader.java
res/values/strings.xml
src/com/owncloud/android/ui/activity/Uploader.java