Dan Stillman 4caae896cf Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/attachments.js chrome/content/zotero/xpcom/translation/translate_item.js install.rdf update.rdf		2012-11-23 01:49:32 -05:00
..
engines.json	Merge branch '3.0'	2012-11-12 16:04:39 -05:00
repotime.txt	Merge branch '3.0'	2012-11-23 01:49:32 -05:00
system.sql	Don't unpack xpi	2012-01-29 15:15:23 -05:00
triggers.sql	Don't unpack xpi	2012-01-29 15:15:23 -05:00
userdata.sql	Don't unpack xpi	2012-01-29 15:15:23 -05:00