Merge branch 'develop' into download_folder
authorjabarros <jabarros@solidgear.es>
Wed, 7 Jan 2015 13:04:46 +0000 (14:04 +0100)
committerjabarros <jabarros@solidgear.es>
Wed, 7 Jan 2015 13:04:46 +0000 (14:04 +0100)
commitd05d5ffe1a5b7a4f470afa541515a0b9c7eb9f59
treed3b0553fa5278c9b62183490edcd086e5e44e498
parentf737785b4f708d2bff23d08bb7dde4ae34ee5533
parentf670cfad8f3d79e3b0fc53bf62b45d8122ecdb77
Merge branch 'develop' into download_folder
res/values/strings.xml
src/com/owncloud/android/services/OperationsService.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java