Merge "Increase default minimum password length on privileged groups and bots"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Thu, 13 Dec 2018 23:41:51 +0000 (23:41 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 13 Dec 2018 23:41:51 +0000 (23:41 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 13 Dec 2018 23:41:51 +0000 (23:41 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 13 Dec 2018 23:41:51 +0000 (23:41 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 13 Dec 2018 23:41:51 +0000 (23:41 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 13 Dec 2018 23:41:51 +0000 (23:41 +0000)