Dan Stillman 3fbb17a2e6 Properly upload local changes after automatic conflict resolution ... If an object changed on both sides and the changes were either non-conflicting or identical but there were other local changes, the local object was incorrectly being marked as synced, causing it not to be uploaded until it was next modified locally.		2019-05-08 04:34:21 -04:00
..
zotero	Properly upload local changes after automatic conflict resolution	2019-05-08 04:34:21 -04:00
zotero-platform	Remove lots of old Zotero for Firefox code	2018-08-17 03:17:08 -04:00