Dan Stillman 992f08b8b3 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/storage.js		2013-09-06 14:29:17 -04:00
..
tlds.js	Zotero Everywhere megacommit	2011-06-14 00:36:21 +00:00
translate.js	Merge branch '4.0'	2013-09-06 14:29:17 -04:00
translate_firefox.js	Fix #312, Google Books translator fails in Fx Nightly > 4/2	2013-04-23 00:17:35 -04:00
translate_item.js	Fix error exporting linked HTML file	2013-08-04 23:30:28 -04:00
translator.js	Make translator loading asynchronous	2013-08-17 03:15:43 -04:00
translators.js	Use consistent style for promises	2013-08-20 16:55:01 -04:00