Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2016-08-02 03:26:53 -07:00
commit bc3482b281

View file

@ -151,7 +151,7 @@
@if ($setting->ldap_enabled == 1)
<td>
{{ $setting->ldap_server }}:{{ $setting->ldap_port }}
{{ $setting->ldap_server }}
@if ($setting->is_ad == '1')
(Active Directory)
@endif