Merge branch 'share_link__new_share' into share_link__unshare_file
authormasensio <masensio@solidgear.es>
Wed, 5 Feb 2014 10:25:39 +0000 (11:25 +0100)
committermasensio <masensio@solidgear.es>
Wed, 5 Feb 2014 10:25:39 +0000 (11:25 +0100)
commite437d8320db116025aab1549ff7bd9ec53aa64d6
tree16af2c8aee34ff192fa09d016e8a50ac12f51d83
parent09bb7bce234cf9fc22d23a598ab4f9aec46909ec
parent44c730167c0d1bb05d04be4859ba1ad7848a6225
Merge branch 'share_link__new_share' into share_link__unshare_file
res/values/strings.xml
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/operations/GetSharesOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java