Merge pull request #6356 from MrPetovan/task/6355-add-password-rules

author Tobias Diekershoff <tobias.diekershoff@gmx.net>

Thu, 10 Jan 2019 09:37:32 +0000 (10:37 +0100)

committer GitHub <noreply@github.com>

Thu, 10 Jan 2019 09:37:32 +0000 (10:37 +0100)
author Tobias Diekershoff <tobias.diekershoff@gmx.net>
Thu, 10 Jan 2019 09:37:32 +0000 (10:37 +0100)
committer GitHub <noreply@github.com>
Thu, 10 Jan 2019 09:37:32 +0000 (10:37 +0100)
diff --cc mod/settings.php
Simple merge
diff --cc src/Core/Console/NewPassword.php
Simple merge
diff --cc src/Model/User.php
Simple merge
author	Tobias Diekershoff <tobias.diekershoff@gmx.net>
	Thu, 10 Jan 2019 09:37:32 +0000 (10:37 +0100)
committer	GitHub <noreply@github.com>
	Thu, 10 Jan 2019 09:37:32 +0000 (10:37 +0100)
		1	2
mod/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Core/Console/NewPassword.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Model/User.php	patch \|	diff1 \|	diff2 \|	blob \| history