zotero/chrome/content/zotero/preferences
Simon Kornblith b3f9f5102b Merge branch '3.0'
Conflicts:
	chrome/content/zotero/overlay.js
	chrome/content/zotero/xpcom/schema.js
2012-02-28 17:22:34 -05:00
..
preferences.js Merge branch '3.0' 2012-02-28 17:22:34 -05:00
preferences.xul Merge branch '3.0' 2012-02-28 17:22:34 -05:00
preferences_firefox.xul Don't show site-specific Quick Copy in Standalone 2012-02-22 04:40:34 -05:00
proxyEditor.js Switch client code license to Affero GPL version 3 2011-05-18 18:34:22 +00:00
proxyEditor.xul Switch client code license to Affero GPL version 3 2011-05-18 18:34:22 +00:00
quickCopySiteEditor.xul Switch client code license to Affero GPL version 3 2011-05-18 18:34:22 +00:00