projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 8981be0)
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


No differences found
ownCloud Android App