You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

lilia 3e73f8f0ba Resolve conflicts in series ... Attempting to resolve outgoing conflicts in parallel triggers multiple requests for new keys from the server and causes it to return a 500 error.		10 years ago
..
conversations.js	Resolve conflicts in series	10 years ago
messages.js	Resolve conflicts in series	10 years ago