Merge branch 'develop' into release-1.5.4
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 7 Feb 2014 11:04:02 +0000 (12:04 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 7 Feb 2014 11:04:02 +0000 (12:04 +0100)
commitffa7b517841f927c385a02552a2de6a41d62ec79
treed2021c27f4dda5dab37d7a57de29079379c757b3
parent807047be7a437153a36b038d6d0d409c76d92ab5
parent9fd493aa106c0d5568953fb9f6fd82f3d5d7174b
Merge branch 'develop' into release-1.5.4
owncloud-android-library
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java