Merge pull request #944 from thewilli/configure-rememberme

author VirtualTam <virtualtam+github@flibidi.net>

Sun, 27 Aug 2017 14:36:53 +0000 (16:36 +0200)

committer GitHub <noreply@github.com>

Sun, 27 Aug 2017 14:36:53 +0000 (16:36 +0200)
author VirtualTam <virtualtam+github@flibidi.net>
Sun, 27 Aug 2017 14:36:53 +0000 (16:36 +0200)
committer GitHub <noreply@github.com>
Sun, 27 Aug 2017 14:36:53 +0000 (16:36 +0200)
diff --cc application/config/ConfigManager.php
Simple merge
diff --cc index.php
Simple merge
author	VirtualTam <virtualtam+github@flibidi.net>
	Sun, 27 Aug 2017 14:36:53 +0000 (16:36 +0200)
committer	GitHub <noreply@github.com>
	Sun, 27 Aug 2017 14:36:53 +0000 (16:36 +0200)
		1	2
application/config/ConfigManager.php	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history