Commit graph

205 commits

Author SHA1 Message Date
iNPUTmice 4d7bee2e38 fixed #634 2014-11-09 10:51:54 +01:00
Sam Whited 96563aca52 Add last seen info to the database
Fixes #612
2014-11-04 16:41:35 -05:00
iNPUTmice 1ea2e7dc3b fixed arrayoutofbounds + spelling 2014-11-01 14:33:34 +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