moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-11 03:35:09 -05:00
Code Issues Releases Wiki Activity
46f147a82c
Conversations/src/main/java
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
..
eu/siacs/conversations Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00