Merge branch 'switchListVsGridMaster' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 16:55:56 +0000 (17:55 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 16:55:56 +0000 (17:55 +0100)
commite8654191a721c6d5831992645f2c4f38a7ca35b7
treea1664a93587e8bc5e30385c392edcada99611ff4
parentd6888f474f6f6cb284f8ef41b00b1aae1dff814f
parent65f8034c3030948b0a348f7f654821b6226f6a1d
Merge branch 'switchListVsGridMaster' into beta
res/values/strings.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java