Commit Graph

4 Commits

Author SHA1 Message Date
Aitor Beriain
d9182fe81c Update basque translation 2014-11-27 18:33:42 +01:00
Aitor Beriain
24b5d0eb26 Update basque translation 2014-11-19 16:12:31 +01:00
Sam Whited
46f147a82c Merge branch 'gradle' into development
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
Sam Whited
281ce3105f Make conversations the root project 2014-10-22 15:47:11 -04:00