projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 31f6e61)
Merge branch 'setup_multiaccount' into setup_app_name
authormasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 10:32:22 +0000 (12:32 +0200)
committermasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 10:32:22 +0000 (12:32 +0200)
Conflicts:
res/values/setup.xml
src/com/owncloud/android/authentication/AccountAuthenticator.java


No differences found
ownCloud Android App