1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
profanity/unittests/xmpp
James Booth 9aff8abd2e Merge branch 'master' into openpgp
Conflicts:
	.travis.yml
2015-06-05 23:02:56 +01:00
..
stub_xmpp.c Merge branch 'master' into openpgp 2015-06-05 23:02:56 +01:00