projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5695c5c 08443f9)
Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 22 Oct 2015 11:03:53 +0000 (13:03 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 22 Oct 2015 11:03:53 +0000 (13:03 +0200)
1  2 
res/layout/account_setup.xml patch | diff1 | diff2 | blob | history
res/values/colors.xml patch | diff1 | diff2 | blob | history

diff --cc res/layout/account_setup.xml
Simple merge
diff --cc res/values/colors.xml
Simple merge
ownCloud Android App