Merge remote-tracking branch 'remotes/upstream/bug_1300' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 27 Nov 2015 16:48:54 +0000 (17:48 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 27 Nov 2015 16:48:54 +0000 (17:48 +0100)
commit8187a6e5126867cc859113aeb1677f3dcd9ef96b
tree48101bff344250c0eb90cdb29de8db09e5c36401
parent32dadbcc6ca0de9924f216f81c6a124862ab3136
parent6d8faafd9a3921aee3e23e2a44631674421f5f59
Merge remote-tracking branch 'remotes/upstream/bug_1300' into beta
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java