Merge branch 'develop' into send_file_pr311_with_develop
authormasensio <masensio@solidgear.es>
Wed, 19 Feb 2014 07:51:58 +0000 (08:51 +0100)
committermasensio <masensio@solidgear.es>
Wed, 19 Feb 2014 07:51:58 +0000 (08:51 +0100)
commit9343650e8496e6b1c895e448ad91bc9682d3c2f2
tree00cac9ebf51902b4bb58b9fb04e41f78e875c95f
parentc6d4f4980b1099764f8dc169abe881f7191fca6b
parent34776c03ba2bd3018ee64233559fb25458983e59
Merge branch 'develop' into send_file_pr311_with_develop
src/com/owncloud/android/files/FileOperationsHelper.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