Dan Stillman 6456b6f561 Adds partial collection conflict resolution support -- items are auto-merged, and an alert is displayed. Support for collection metadata and collection hierarchy conflicts is forthcoming, and the alert will be fed to a new notifications system.		2008-11-30 19:30:15 +00:00
..
content	Adds partial collection conflict resolution support -- items are auto-merged, and an alert is displayed. Support for collection metadata and collection hierarchy conflicts is forthcoming, and the alert will be fed to a new notifications system.	2008-11-30 19:30:15 +00:00
locale	Much improved storage syncing (theoretically)	2008-11-29 14:13:29 +00:00
skin/default/zotero	Missing icon from previous commit	2008-11-29 14:14:53 +00:00