Dan Stillman 60e5ab8124 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/db.js chrome/content/zotero/xpcom/fulltext.js chrome/content/zotero/xpcom/zotero.js chrome/content/zotero/zoteroPane.js components/zotero-service.js install.rdf update.rdf		2014-04-08 18:47:32 -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, renamed styles, and repo time	2014-03-16 00:22:21 -04:00
repotime.txt	Update versions, submodules, and repotime	2014-03-21 04:10:38 -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