projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1e73ec 22f0f59)
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 7 Sep 2015 09:16:29 +0000 (11:16 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 7 Sep 2015 09:16:29 +0000 (11:16 +0200)
1  2 
res/layout/file_preview.xml patch | diff1 | diff2 | blob | history
src/com/owncloud/android/ui/activity/FileDisplayActivity.java patch | diff1 | diff2 | blob | history

diff --cc res/layout/file_preview.xml
Simple merge
ownCloud Android App