Merge remote-tracking branch 'remotes/upstream/master' into resizedImagesMaster
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 5 Nov 2015 21:04:57 +0000 (22:04 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 5 Nov 2015 21:04:57 +0000 (22:04 +0100)
commitce841a3c4f7e32d5f54972dbc8d9b950174ed2ca
tree1a86a34106cd95be4cfa8ba5339ca6c64dc2703c
parentd5ee0ef158740910290ab6a9d21223bd2c9c5375
parent7e96305668f038aee9ffe5cc3fe0c17a293fed6e
Merge remote-tracking branch 'remotes/upstream/master' into resizedImagesMaster
AndroidManifest.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java