Merge pull request #8909 from MrPetovan/task/ex_auth

author Michael Vogel <icarus@dabo.de>

Sat, 22 Aug 2020 20:12:22 +0000 (22:12 +0200)

committer GitHub <noreply@github.com>

Sat, 22 Aug 2020 20:12:22 +0000 (22:12 +0200)
author Michael Vogel <icarus@dabo.de>
Sat, 22 Aug 2020 20:12:22 +0000 (22:12 +0200)
committer GitHub <noreply@github.com>
Sat, 22 Aug 2020 20:12:22 +0000 (22:12 +0200)
diff --cc src/Model/User.php
Simple merge
diff --cc src/Util/ExAuth.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Sat, 22 Aug 2020 20:12:22 +0000 (22:12 +0200)
committer	GitHub <noreply@github.com>
	Sat, 22 Aug 2020 20:12:22 +0000 (22:12 +0200)
		1	2
src/Model/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Util/ExAuth.php	patch \|	diff1 \|	diff2 \|	blob \| history