Merge branch 'develop' into ignoreHiddenFiles
authorpurigarcia <pgarcia@solidgear.es>
Fri, 21 Aug 2015 09:18:17 +0000 (11:18 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Fri, 21 Aug 2015 09:18:17 +0000 (11:18 +0200)
commite9ca430fa06e2f76520fe25b0971f82265487672
tree73c98702ab71ee8269ef56538999df1c9f0155ac
parent8b23c3a7a693d3ab7f8a6ca721b24a80011fb13c
parent0c7a9c3e3a0bba9344db08c8c2acf2718b968e92
Merge branch 'develop' into ignoreHiddenFiles
src/com/owncloud/android/ui/fragment/OCFileListFragment.java