Merge branch 'develop' into share_link__unshare_file
authormasensio <masensio@solidgear.es>
Fri, 7 Feb 2014 11:02:38 +0000 (12:02 +0100)
committermasensio <masensio@solidgear.es>
Fri, 7 Feb 2014 11:02:38 +0000 (12:02 +0100)
commitebbc1793e23f67dc7aa2214a542fa2c037fcf4c2
tree96290ee96d8e80b0d28fbbcd4f296447d28f9b72
parente49e66042fcbe09410b7547387604e3f380db95f
parent9fd493aa106c0d5568953fb9f6fd82f3d5d7174b
Merge branch 'develop' into share_link__unshare_file
owncloud-android-library
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java