Merge branch '4.0' into api_syncing

Conflicts:
	chrome/content/zotero/lookup.js
This commit is contained in:
Dan Stillman 2015-04-15 00:56:25 -04:00
commit 384a547693
3 changed files with 34 additions and 8 deletions

View file

@ -76,6 +76,7 @@ mkdir "$PROFILE/zotero"
cat <<EOF > "$PROFILE/prefs.js"
user_pref("extensions.autoDisableScopes", 0);
user_pref("extensions.zotero.debug.log", $DEBUG);
user_pref("extensions.zotero.debug.time", $DEBUG);
user_pref("extensions.zotero.firstRunGuidance", false);
user_pref("extensions.zotero.firstRun2", false);
EOF