Merge pull request #1096 from christophert/add-ldaptlsinsecure

author Dan Brown <redacted>

Sat, 22 Dec 2018 16:38:50 +0000 (16:38 +0000)

committer GitHub <redacted>

Sat, 22 Dec 2018 16:38:50 +0000 (16:38 +0000)
author Dan Brown <redacted>
Sat, 22 Dec 2018 16:38:50 +0000 (16:38 +0000)
committer GitHub <redacted>
Sat, 22 Dec 2018 16:38:50 +0000 (16:38 +0000)
diff --cc .env.example
Simple merge
diff --cc app/Auth/Access/LdapService.php
Simple merge
diff --cc config/services.php
Simple merge
author	Dan Brown <redacted>
	Sat, 22 Dec 2018 16:38:50 +0000 (16:38 +0000)
committer	GitHub <redacted>
	Sat, 22 Dec 2018 16:38:50 +0000 (16:38 +0000)
		1	2
.env.example	patch \|	diff1 \|	diff2 \|	blob \| history
app/Auth/Access/LdapService.php	patch \|	diff1 \|	diff2 \|	blob \| history
config/services.php	patch \|	diff1 \|	diff2 \|	blob \| history