session-desktop/js/models
lilia 9c8933c3d0 Resolve conflicts one at a time
Previously, with a mix of text and media messages in conflict,
asynchronous callbacks aligned so as to fail to remove some of
the conflict objects on messages.

Fix by serializing conflict processing, but making sure to move
on through the message list even if some conflict resolutions fail.

Fixes #370

// FREEBIE
2015-11-05 19:42:55 -08:00
..
conversations.js Resolve conflicts one at a time 2015-11-05 19:42:55 -08:00
messages.js Resolve conflicts one at a time 2015-11-05 19:42:55 -08:00