Skip to content
Commit 366c0065 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap

Conflicts:
	app/models/user.rb
parents b2b88b2f 335b3ed1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment