Skip to content
Commit 31f6e61f authored by masensio's avatar masensio
Browse files

Merge branch 'setup_multiaccount' into setup_app_name 

Conflicts:
	res/values/setup.xml
	src/com/owncloud/android/authentication/AccountAuthenticator.java
parents ea7f8fe4 152ab88d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment