Merge branch 'develop' into share_link__new_share
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 4 Feb 2014 13:43:36 +0000 (14:43 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 4 Feb 2014 13:43:36 +0000 (14:43 +0100)
commit3eb043caf03305a7a4f4d8dc51d87a1e56b1c42a
treee8cebaa1febfeada207244364094c0c64637badc
parente2a4ad78de381058300972aa61072de086f3feeb
parentef95cea5c9e941f4bd23035e1e1a6afeb911d4a2
Merge branch 'develop' into share_link__new_share
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java