erinn
|
9734540aca
|
merging
|
2018-11-23 17:30:18 -08:00 |
Sarah Jamie Lewis
|
b418eab92f
|
Merge branch 'acn2' of dan/cwtch into master
|
2018-11-23 03:17:50 +00:00 |
Sarah Jamie Lewis
|
319c724c05
|
Merge branch 'test-channels' of dan/cwtch into master
|
2018-11-22 23:59:04 +00:00 |
Dan Ballard
|
6f6fa90946
|
add channels to tests using Listen in a thread to sync; add some cleanup to other tests; fix a potential NPE
|
2018-11-22 14:29:05 -08:00 |
Dan Ballard
|
8a0d9c54fd
|
local var rename
|
2018-11-22 13:47:35 -08:00 |
Sarah Jamie Lewis
|
9421e471f6
|
Merge branch 'metrics-revert' of dan/cwtch into master
|
2018-11-22 18:54:10 +00:00 |
Dan Ballard
|
4814e0b409
|
undo use of personal fork, pr got merged
|
2018-11-22 10:08:21 -08:00 |
Sarah Jamie Lewis
|
60fb12054a
|
Merge branch 'bigmerge' of cwtch.im/cwtch into master
|
2018-11-22 01:05:23 +00:00 |
erinn
|
ddbf96e668
|
little fixes
|
2018-11-21 16:56:08 -08:00 |
erinn
|
d06b68d001
|
Merge branch 'acn' of dan/cwtch into master
|
2018-11-22 00:26:26 +00:00 |
erinn
|
7ae9954c7d
|
Merge branch 'p2ptimeline' of cwtch.im/cwtch into master
|
2018-11-22 00:25:32 +00:00 |
Dan Ballard
|
ff54059111
|
update name
|
2018-11-21 15:10:02 -08:00 |
Dan Ballard
|
b087d3667e
|
Merge branch 'servercheck' of cwtch.im/cwtch into p2ptimeline
|
2018-11-21 22:39:47 +00:00 |
Sarah Jamie Lewis
|
dc489398ea
|
Checking if a group is setup on a v3 onion server
|
2018-11-21 14:29:38 -08:00 |
Sarah Jamie Lewis
|
8083e6fa5c
|
Adding Method to Save Messages in p2p Transcript
|
2018-11-21 13:31:22 -08:00 |