Skip to content
GitLab
Explore
Sign in
Commit
16b9ff50
authored
Apr 13, 2015
by
Dmitriy Zaporozhets
Browse files
Merge branch 'ldap_migration'
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
Conflicts: db/schema.rb
parent
c4892d65
Loading
Loading
Loading
Changes
7