Merge pull request #5920 from MrPetovan/bug/remove-password-from-register

author Michael Vogel <icarus@dabo.de>

Wed, 17 Oct 2018 19:04:11 +0000 (21:04 +0200)

committer GitHub <noreply@github.com>

Wed, 17 Oct 2018 19:04:11 +0000 (21:04 +0200)
author Michael Vogel <icarus@dabo.de>
Wed, 17 Oct 2018 19:04:11 +0000 (21:04 +0200)
committer GitHub <noreply@github.com>
Wed, 17 Oct 2018 19:04:11 +0000 (21:04 +0200)
diff --cc boot.php
Simple merge
diff --cc include/enotify.php
Simple merge
diff --cc mod/admin.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Wed, 17 Oct 2018 19:04:11 +0000 (21:04 +0200)
committer	GitHub <noreply@github.com>
	Wed, 17 Oct 2018 19:04:11 +0000 (21:04 +0200)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/enotify.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history