Dan Stillman bd070f7b63 - Adds file conflict resolution -- not particularly attractive at the moment, and no Apply to All button, but possibly functional ... - Fixes file syncing after editing a file locally - Fixes a few storage bugs that could result in eternal spinning, invalid percentages, and other unpleasantries - Made the attachment display box more flexible, including a filename field that we may or may not want to keep in the main view		2009-01-15 06:58:06 +00:00
..
zotero	- Adds file conflict resolution -- not particularly attractive at the moment, and no Apply to All button, but possibly functional	2009-01-15 06:58:06 +00:00
zotero-platform	Merged r3888 from branch	2008-12-29 09:35:11 +00:00