narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity
conversations-classic/src/main
History
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
..
java/eu/siacs/conversations Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
res Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
AndroidManifest.xml Make conversations the root project 2014-10-22 15:47:11 -04:00