mozilla-central: changeset 242626:617dbce2672637a1b232316f12f46a7477f50d82

author	Justin Dolske <dolske@mozilla.com>
	Wed, 06 May 2015 16:20:00 -0700
changeset 242626	617dbce2672637a1b232316f12f46a7477f50d82
parent 242625	87bffdf0233b34e96a4ba2a9b8fdbd6a929f10ab
child 242634	af7357d7fd10f8e4becfecd0e455abc1850817c2
push id	28702
push user	jdolske@mozilla.com
push date	Wed, 06 May 2015 23:22:16 +0000
treeherder	mozilla-central@617dbce26726 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	gavin, dolske
bugs	1161881
milestone	40.0a1
first release with	nightly linux32 617dbce26726 / 40.0a1 / 20150507030203 / files nightly linux64 617dbce26726 / 40.0a1 / 20150507030203 / files nightly mac 617dbce26726 / 40.0a1 / 20150507030203 / files nightly win32 617dbce26726 / 40.0a1 / 20150507030203 / files nightly win64 617dbce26726 / 40.0a1 / 20150507030203 / files
last release without	nightly linux32 60349cbc3d4e / 40.0a1 / 20150506030206 / files nightly linux64 60349cbc3d4e / 40.0a1 / 20150506030206 / files nightly mac 60349cbc3d4e / 40.0a1 / 20150506030206 / files nightly win32 60349cbc3d4e / 40.0a1 / 20150506030206 / files nightly win64 60349cbc3d4e / 40.0a1 / 20150506030206 / files
releases	nightly linux32 40.0a1 / 20150507030203 / pushlog to previous nightly linux64 40.0a1 / 20150507030203 / pushlog to previous nightly mac 40.0a1 / 20150507030203 / pushlog to previous nightly win32 40.0a1 / 20150507030203 / pushlog to previous nightly win64 40.0a1 / 20150507030203 / pushlog to previous

--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1912,14 +1912,14 @@ pref("browser.reader.detectedFirstArticl
 // Don't limit how many nodes we care about on desktop:
 pref("reader.parse-node-limit", 0);
 
 // Enable Service workers for desktop on non-release builds
 #ifdef NIGHTLY_BUILD
 pref("dom.serviceWorkers.enabled", true);
 #endif
 
-pref("browser.pocket.enabled", false);
+pref("browser.pocket.enabled", true);
 pref("browser.pocket.api", "api.getpocket.com");
 pref("browser.pocket.site", "getpocket.com");
 pref("browser.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4");
 pref("browser.pocket.useLocaleList", true);
 pref("browser.pocket.enabledLocales", "en-US");