Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:29:35 +0000 (18:29 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:29:35 +0000 (18:29 +0100)
commit32ea46eb23d956f89d783aac72000470f5abf4ac
tree53375808b37bd020ab80de5928b2b3644b2c6b0f
parentbfe9127dbe9e33453e379d7466d4b0650663a9fb
parent47c1cacdf27e8e22ed3984459b85e42fa80eab0c
Merge remote-tracking branch 'remotes/upstream/switchOfflineFiles' into beta
res/values/strings.xml
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/FolderPickerActivity.java
src/com/owncloud/android/ui/activity/Uploader.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/PreviewImagePagerAdapter.java