From db1934e897c417825ffbcf171e60c0e1f8071b8b Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 20 Mar 2018 16:04:41 -0600
Subject: [PATCH 1/2] fixed password reset email form

---
 routes/api/v1/account.js | 2 +-
 yarn.lock                | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/routes/api/v1/account.js b/routes/api/v1/account.js
index e1395323d..f7d8ea126 100644
--- a/routes/api/v1/account.js
+++ b/routes/api/v1/account.js
@@ -80,7 +80,7 @@ router.post('/password/reset', async (req, res, next) => {
           token,
         },
         subject: 'Password Reset',
-        to: email,
+        email,
       });
     }
 
diff --git a/yarn.lock b/yarn.lock
index 3556a26ba..786086d39 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8239,10 +8239,6 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-pell@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/pell/-/pell-1.0.1.tgz#8f1e97165001024e5f371e0ce0b329457c847b5d"
-
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"

From b43b67e8fa2b828e333a13799aeebf0dd56e830e Mon Sep 17 00:00:00 2001
From: Juan Pablo Kutianski <jkutianski@gmail.com>
Date: Tue, 20 Mar 2018 23:10:30 -0300
Subject: [PATCH 2/2] change Facebook to Google+

---
 plugins/talk-plugin-google-auth/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/talk-plugin-google-auth/README.md b/plugins/talk-plugin-google-auth/README.md
index edf0b9488..f68b56c32 100644
--- a/plugins/talk-plugin-google-auth/README.md
+++ b/plugins/talk-plugin-google-auth/README.md
@@ -11,7 +11,7 @@ plugin:
         - Client
 ---
 
-Enables sign-in via Facebook via the server side passport middleware.
+Enables sign-in via Google+ via the server side passport middleware.
 
 You will need to enable the Google+ API in the dashboard and create credentials
 for a new OAuth client ID web application. The authorized JavaScript origin
@@ -26,4 +26,4 @@ Configuration:
   the [Google API Console](https://console.developers.google.com/apis/).
 - `TALK_GOOGLE_CLIENT_SECRET` (**required**) - The Google OAuth2 client ID for
   your Google login web app. You can learn more about getting a Google Client
-  ID at the [Google API Console](https://console.developers.google.com/apis/).
\ No newline at end of file
+  ID at the [Google API Console](https://console.developers.google.com/apis/).