Skip to content
Commit 017f9429 authored by masensio's avatar masensio
Browse files

Merge branch 'setup_multiaccount' into setup_app_name 

Conflicts:
	src/com/owncloud/android/ui/activity/AccountSelectActivity.java
parents fc5608de 673c8847
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