merge develop
authorpurigarcia <pgarcia@solidgear.es>
Tue, 28 Jul 2015 08:46:13 +0000 (10:46 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Tue, 28 Jul 2015 08:46:13 +0000 (10:46 +0200)
commitf068a156c56122c3239d1af64e654280b49aff8b
tree779a3a3f27b350c57ecec4b6580b2fa1a1536d43
parent6b82b98abfde7f31fd6433295e9988ae447088a7
parent2ac67e5e0654ff6322d718bdfb8482be2baefe93
merge develop
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java