Commit 3a541b0f authored by Xavier's avatar Xavier

Merge branch 'master' into satcor_master

Conflicts:
	AndroidManifest.xml
parents 38d59646 fa2ebd86
Markdown is supported
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