Merge branch 'develop' of https://github.com/tobiasKaminsky/android into develop
Conflicts: src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Please register or sign in to comment
Conflicts: src/com/owncloud/android/ui/adapter/FileListListAdapter.java