Skip to content
Commit 9b4da843 authored by David A. Velasco's avatar David A. Velasco
Browse files

Merge branch 'develop' into oauth_login 

Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml
parents 2b3f7c54 bfbb733b
Expand all 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