From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sat, 30 Jan 2016 07:44:29 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 security/README.txt |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/security/README.txt b/security/README.txt
index b68f647..b42cbaa 100644
--- a/security/README.txt
+++ b/security/README.txt
@@ -69,6 +69,10 @@
 Options:     yes/no
 Description: Disables the remote API
 
+Setting:     password_reset_allowed
+Options:     yes/no
+Description: Disables the password reset function.
+
 Setting:     ids_enabled
 Options:     yes/no
 Description: Enables the Intrusion Detection System

--
Gitblit v1.9.1