Commit graph

106 commits

Author SHA1 Message Date
ferdev1 6c13b8a9a1 Update strings.xml 2014-11-17 17:13:20 +01:00
kruks23 0dc711d710 Update Spanish Translations 2014-11-15 20:48:31 +01:00
iNPUTmice 26b4788733 formating 2014-11-09 21:27:37 +01:00
kruks23 6f6f15d563 Update Spanish Translations 2014-11-09 13:29:30 +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