app/controllers/omniauth_callbacks_controller.rb · 366c0065c4302eacbb26ba7292c4c0528dbd33a6 · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap · 366c0065
randx authored Aug 21, 2012
```
Conflicts:
	app/models/user.rb
```
366c0065