projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97747c9 a38461a)
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 25 Sep 2015 14:08:24 +0000 (16:08 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 25 Sep 2015 14:08:24 +0000 (16:08 +0200)
1  2 
res/layout/account_setup.xml patch | diff1 | diff2 | blob | history
src/com/owncloud/android/authentication/AuthenticatorActivity.java patch | diff1 | diff2 | blob | history

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