moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-25 02:02:16 -05:00
Code Issues Releases Wiki Activity
46f147a82c
Conversations/src/main/java/eu/siacs/conversations
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
..
crypto Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
entities Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
generator Make conversations the root project 2014-10-22 15:47:11 -04:00
http Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
parser Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
persistance Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
services Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
ui Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
utils Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
xml Make conversations the root project 2014-10-22 15:47:11 -04:00
xmpp Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
Config.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00