projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: b694fee)
Merge commit 'refs/pr/707' into text_file_preview_pr_707_with
authormasensio <masensio@solidgear.es>
Wed, 5 Aug 2015 14:48:12 +0000 (16:48 +0200)
committermasensio <masensio@solidgear.es>
Wed, 5 Aug 2015 14:48:12 +0000 (16:48 +0200)
Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java


No differences found
ownCloud Android App