projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a860ff6 f606fe9)
Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 22 Jun 2015 09:23:05 +0000 (11:23 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 22 Jun 2015 09:23:05 +0000 (11:23 +0200)
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java

1  2 
owncloud-android-library patch | diff1 | diff2 | blob | history

diff --cc owncloud-android-library
index 344d5b2,2b2fc91..ff85ff2
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 344d5b22e43021ebc54f18ad7d17b1702dfa406c
 -Subproject commit 2b2fc9171f2cf2c4701a74e4a564148584aab33a
++Subproject commit ff85ff2eef6d418de75ab587ad9b7489d868a22a
ownCloud Android App