Merge branch 'develop' into imageGrid
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Feb 2015 12:48:30 +0000 (13:48 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Feb 2015 12:48:30 +0000 (13:48 +0100)
commit4af15f7b4ed255f8ccc378e9cf2e47280868129d
tree4512616f41e0180344e3da8dada5ccd59f7da5b4
parent42b5a1e28f8474823847bd1e0b1967e823dbdb81
parent7f23fa5a77396cf145f06ac1749b2b47feb00762
Merge branch 'develop' into imageGrid
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java