From: Dmitriy Zaporozhets Date: Fri, 17 Jan 2014 10:37:22 +0000 (+0000) Subject: Merge branch 'explain_allow_username_or_email_login' into 'master' X-Git-Tag: v6.5.0.rc1~15 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3fe578a7fdaea8607cf98ffb1878c03fd5ac3649;p=wvm%2Fgitlab.git Merge branch 'explain_allow_username_or_email_login' into 'master' Explain allow_username_or_email_login LDAP setting --- 3fe578a7fdaea8607cf98ffb1878c03fd5ac3649