projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1c7093 803f672)
Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:45:14 +0000 (18:45 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:45:14 +0000 (18:45 +0200)
1  2 
SETUP.md patch | diff1 | diff2 | blob | history

diff --cc SETUP.md
Simple merge
ownCloud Android App