Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 3 Dec 2014 10:31:49 +0000 (11:31 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 3 Dec 2014 10:31:49 +0000 (11:31 +0100)
commit50e39f044f0ac1bbd572ba9eb8178a415791a8a5
treeabde22fec148dd158aef2c9951a8b1c9baf4be73
parentd58d6ca4d02233d4a9370104dd3d10bdac7aa4b8
parentbad9f3011590d2f6b634833e3ef9e78a8fa0a96e
Merge branch 'master' into develop
owncloud-android-library
res/values/strings.xml
src/com/owncloud/android/ui/fragment/OCFileListFragment.java