zotero/chrome/content
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
..
zotero Merge branch '4.0' 2014-07-15 22:17:27 -04:00
zotero-platform Closes #482, Include active info pane tab in tab cycle on OS X 2014-05-17 04:10:37 -04:00