mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch '3.0'

Browse source 
Conflicts:
	chrome/content/zotero/xpcom/storage/webdav.js
	chrome/content/zotero/zoteroPane.js
	chrome/skin/default/zotero/preferences.css
This commit is contained in:
Dan Stillman 2011-12-17 16:25:58 -05:00
commit 059460a5d2
14 changed files with 119 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/zotero-service.js
View file

@ -76,7 +76,6 @@ const xpcomFilesLocal = [
'data/relations',
'data/tag',
'data/tags',
'date',
'db',
'duplicates',
'enstyle',