Merge branch 'develop' into sorting_files_2
authorjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 08:18:20 +0000 (10:18 +0200)
committerjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 08:18:20 +0000 (10:18 +0200)
commit2fad1e1a996c1f6058445ca398a74743b0e93023
treee9d75c00245df0200ede2cd3c86de462fb912073
parent7d9fc6857e1d534c1930b94b6063f1e21a827e9b
parent832a98f47c4f399141c2e36af09509853727ba5b
Merge branch 'develop' into sorting_files_2

Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
res/values-de/strings.xml
res/values/strings.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java