From 144d6830727b145f44257d605d28bae96ec34533 Mon Sep 17 00:00:00 2001
From: deepwa <33255214+deepwa@users.noreply.github.com>
Date: Tue, 31 Oct 2017 17:59:47 +0530
Subject: [PATCH 1/2] Update CODE_OF_CONDUCT.md

---
 CODE_OF_CONDUCT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index cd2e2af63c771..2ea090ced34bb 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -25,7 +25,7 @@ Examples of unacceptable behavior by participants include:
 * The use of sexualized language or imagery and unwelcome sexual attention or
 advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
+* Public or private harassment/threats
 * Publishing others' private information, such as a physical or electronic
   address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a

From 0868d215322558eb6f3acd0fb63dc2368b024d82 Mon Sep 17 00:00:00 2001
From: deepwa <33255214+deepwa@users.noreply.github.com>
Date: Tue, 31 Oct 2017 18:02:44 +0530
Subject: [PATCH 2/2] Update FEATURES.md

---
 FEATURES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FEATURES.md b/FEATURES.md
index 381c09a0baf02..e6b29b3f86d9f 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -8,7 +8,7 @@
   - SAML
   - LDAP
   - CAS (1.0, 2.0 + attribute sync)
-  - Facebook, Github, Google, etc.
+  - Facebook, Github, Google talk, etc.
 - I18N: More than 30 languages so far
 - File Uploading
   - Drag-and-drop