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
..
content	Fix merging of tags during sync conflict	2013-09-04 17:53:11 -04:00
locale	Localize et al. in the middle pane	2013-08-15 23:15:02 +02:00
skin/default/zotero	Remove some unnecessary CSS	2013-07-16 03:22:24 -04:00