Skip to content
Commit 46f147a8 authored by Sam Whited's avatar Sam Whited
Browse files

Merge branch 'gradle' into development 

Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
parents 142384e5 a362bd10
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