Merge pull request #1182 from ArthurHoaro/feature/session-protection-stay-login

author ArthurHoaro <arthur@hoa.ro>

Sat, 9 Feb 2019 11:36:31 +0000 (12:36 +0100)

committer GitHub <noreply@github.com>

Sat, 9 Feb 2019 11:36:31 +0000 (12:36 +0100)
author ArthurHoaro <arthur@hoa.ro>
Sat, 9 Feb 2019 11:36:31 +0000 (12:36 +0100)
committer GitHub <noreply@github.com>
Sat, 9 Feb 2019 11:36:31 +0000 (12:36 +0100)
diff --cc application/security/LoginManager.php
Simple merge
diff --cc tests/security/LoginManagerTest.php
Simple merge
author	ArthurHoaro <arthur@hoa.ro>
	Sat, 9 Feb 2019 11:36:31 +0000 (12:36 +0100)
committer	GitHub <noreply@github.com>
	Sat, 9 Feb 2019 11:36:31 +0000 (12:36 +0100)
		1	2
application/security/LoginManager.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/security/LoginManagerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history