projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: e6be606)
Merge branch 'master' into copy
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Sep 2015 16:35:51 +0000 (18:35 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Sep 2015 16:35:51 +0000 (18:35 +0200)
Conflicts FIXED:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java


No differences found
ownCloud Android App