From 1e8ffda9a0d9c247445df279efd7c9e355e8bdb5 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Fri, 24 Aug 2018 23:21:16 +0300
Subject: [PATCH] Updated OAuth2 (markdown)

---
 OAuth2.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OAuth2.md b/OAuth2.md
index 5243b37..669d6f3 100644
--- a/OAuth2.md
+++ b/OAuth2.md
@@ -2,6 +2,8 @@
 
 Also, if you have Rocket.Chat using LDAP/SAML/Google/etc for logging into Rocket.Chat, then same users can login to Wekan when Rocket.Chat is providing OAuth2 login to Wekan.
 
+If there is existing username/password account in Wekan, OAuth2 merges both logins.
+
 Source: [OAuth2 Pull Request](https://github.com/wekan/wekan/pull/1578)
 
 ## 1) Install Rocket.Chat