Dan Stillman 36c5dceff4 Merge branch '4.0' ... Conflicts: chrome/content/zotero/browser.js chrome/content/zotero/longTagFixer.js chrome/content/zotero/xpcom/schema.js chrome/content/zotero/xpcom/utilities.js chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2014-07-15 22:17:27 -04:00
..
abbreviations.json	Fix name on abbreviations list	2013-09-19 23:48:20 -04:00
engines.json	Merge branch '3.0'	2012-11-12 16:04:39 -05:00
renamed-styles.json	Update submodules and repotime	2014-06-18 21:12:25 -04:00
repotime.txt	Update submodules and repotime	2014-06-24 17:48:37 -04:00
system.sql	Tag colors, synced settings, and (stopgap) silent DB upgrades	2013-03-03 06:23:25 -05:00
triggers.sql	Fix DB initialization with async DB access	2013-08-15 17:35:16 -04:00
userdata.sql	Merge branch '4.0'	2013-11-24 16:08:46 -05:00