lilia 4b0c70fb44 Resolve multiple conflicts independently ... When resolving multiple conflicts in a conversation, failure to resolve one should not block any others. // FREEBIE		2015-09-15 11:12:47 -07:00
..
conversations.js	Resolve multiple conflicts independently	2015-09-15 11:12:47 -07:00
messages.js	Improve notification behavior	2015-09-14 11:12:08 -07:00