Dan Stillman 840790926b Fix merging of tags during sync conflict ... If an item was added to a tag on one computer and another item was added to the tag on a different computer, and then they both synced one of the tags could be removed on the second computer to sync.		2013-09-04 17:53:11 -04:00
..
zotero	Fix merging of tags during sync conflict	2013-09-04 17:53:11 -04:00
zotero-platform	Disable context menu icons on OS X	2013-04-14 01:47:05 -04:00