Dan Stillman 3a4401a995 Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/integration.js chrome/content/zotero/xpcom/storage/webdav.js chrome/content/zotero/xpcom/storage/zfs.js install.rdf update.rdf		2012-02-09 02:13:02 -05:00
..
about.dtd	Merge new English strings	2011-12-20 02:27:34 -05:00
preferences.dtd	Point directly to 3.0 plugins page from preferences	2012-01-25 16:44:48 -05:00
searchbox.dtd	Merged 1.0 branch back to trunk	2007-10-23 07:11:59 +00:00
standalone.dtd	Merge locales	2011-08-10 19:54:59 +00:00
timeline.properties	Merged 1.0 branch back to trunk	2007-10-23 07:11:59 +00:00
zotero.dtd	Merge branch '3.0'	2011-12-22 12:21:32 -05:00
zotero.properties	Merge locales	2012-02-01 20:11:54 -05:00