lilia ccfae3c78a Fix bug in identity key conflict edge case ... When resolving conflicts, we should not only discard the old key, but set the new trusted key to the one the user has verified. Previously, we would end up trusting the first-seen new key, which may not be the one the user verified. // FREEBIE		2015-07-31 17:01:03 -07:00
..
conversations.js	Fix bug in identity key conflict edge case	2015-07-31 17:01:03 -07:00
messages.js	Set lastmessage text on convo's with no timestamp	2015-07-22 15:24:03 -07:00