Commit Graph

54 Commits

Author SHA1 Message Date
kriztan
fca3e3c756 Update German language
deleted 'pref_about_message'
2014-11-12 20:09:14 +01:00
kriztan
b971965697 Update German language 2014-11-12 13:13:59 +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