Permalink
Browse files

Merge train-126 into master

#2764
r=vbudhram
  • Loading branch information...
philbooth committed Nov 29, 2018
2 parents 43745a6 + 5de9e88 commit d590d6e5f7f63f67226fe22abaedefaff75e745b
Showing with 14 additions and 4 deletions.
  1. +10 −0 CHANGELOG.md
  2. +1 −1 fxa-oauth-server/npm-shrinkwrap.json
  3. +1 −1 fxa-oauth-server/package.json
  4. +1 −1 npm-shrinkwrap.json
  5. +1 −1 package.json
@@ -1,3 +1,13 @@
<a name="1.126.2"></a>
## [1.126.2](https://github.com/mozilla/fxa-auth-server/compare/v1.126.1...v1.126.2) (2018-11-29)
### Bug Fixes
* **metrics:** ensure email sent amplitude events include device id ([03a2f2e](https://github.com/mozilla/fxa-auth-server/commit/03a2f2e))
<a name="1.126.1"></a>
## [1.126.1](https://github.com/mozilla/fxa-auth-server/compare/v1.126.0...v1.126.1) (2018-11-28)

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1,6 +1,6 @@
{
"name": "fxa-oauth-server",
"version": "1.126.1",
"version": "1.126.2",
"private": true,
"description": "Firefox Accounts OAuth2 server.",
"scripts": {

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1,6 +1,6 @@
{
"name": "fxa-auth-server",
"version": "1.126.1",
"version": "1.126.2",
"description": "Firefox Accounts, an identity provider for Mozilla cloud services",
"bin": {
"fxa-auth": "./bin/key_server.js"

0 comments on commit d590d6e

Please sign in to comment.