Merge branch 'kill-e4x'

Conflicts:
	chrome/content/zotero/xpcom/integration.js
This commit is contained in:
Simon Kornblith 2012-06-25 00:42:32 -04:00
commit 57c3d190b4
7 changed files with 135 additions and 1590 deletions

View file

@ -78,7 +78,6 @@ const xpcomFilesLocal = [
'data/tags',
'db',
'duplicates',
'enstyle',
'fulltext',
'id',
'integration',