1
1
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
profanity/tests
James Booth 98b77fa6d2 Merge branch 'master' into osx-functional
Conflicts:
	.travis.yml
	tests/functionaltests/functionaltests.c
2016-09-03 23:12:18 +01:00
..
functionaltests Merge branch 'master' into osx-functional 2016-09-03 23:12:18 +01:00
unittests Rename Bookmark->jid to Bookmark->barejid 2016-08-28 22:12:50 +01:00