From 33ebabfeaf6ac35ccfa1cf3106872f93cb7985a8 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Fri, 19 Oct 2018 16:21:42 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into vharseko-master

---
 README.md |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/README.md b/README.md
index d679a69..e6618da 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,7 @@
 ```
 
 ## Support and Mailing List Information
+* OpenDJ Community Wiki: https://github.com/OpenIdentityPlatform/OpenDJ/wiki
 * OpenDJ Community Mailing List: open-identity-platform-opendj@googlegroups.com
 * OpenDJ Community Archive: https://groups.google.com/d/forum/open-identity-platform-opendj
 * OpenDJ Community on Gitter: https://gitter.im/OpenIdentityPlatform/OpenDJ

--
Gitblit v1.10.0