Merge branch 'master' of https://github.com/owncloud/android into target_marshmallow
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 30 Oct 2015 13:21:45 +0000 (14:21 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 30 Oct 2015 13:21:45 +0000 (14:21 +0100)
commit30e9622ae9b470c53343e68ec0651b962322f4af
tree3e6830c4e38ab27a6e48a949fd4fd8ff879472a9
parent9064e6066c1d7a801ab206e83d06f2cd141ce257
parenteaa0612bfaeeeddc5c4aaeda655d87a925ffcb6e
Merge branch 'master' of https://github.com/owncloud/android into target_marshmallow
.travis.yml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/utils/DisplayUtils.java