Release v1.35.0

mozilla · Apr 14, 2015 · 94c9cc3 · 94c9cc3
1 parent 407113e
commit 94c9cc3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,9 +1,14 @@
+train-35
+  * update to scrypt-hash@1.1.11 to pick up changes needed by new XCode on OS/X - #909, #910
+  * chore(shrinkwrap): update shrinkwrap to get latest fxa-content-server-l10n and other updates
+  * minor other test and build fixes
+
 train-34
   * fix(httpdb): Set verifierSetAt for resetAccount() - #903
   * test(email): script to check delivery and content for all production - #900
   * chore(versions): update fxa-auth-mailer and fxa-auth-db-mem to master - #904
   * chore(shrinkwrap): update versions in shrinkwrap - #904
-  
+
 train-33
   * Update to hapi 8.2.0 - #886
   * Enable build on ARM platforms (including Raspberry Pi) - #887

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-auth-server",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "Firefox Accounts, an identity provider for Mozilla cloud services",
   "bin": {
     "fxa-auth": "./bin/key_server.js"