diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-13 17:18:02 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-13 17:18:02 +0300 |
commit | 4ab717ea6a65beca3e069ca8590c22c49085dc8c (patch) | |
tree | 80f163711240e5f6b7288be276c05f2df80a39ca /CONTRIBUTING.md | |
parent | ecb58dacd614de66c00c8df673abb96fafa5d452 (diff) | |
parent | f39b150a02836f620fe77e1731064b5e6e01b5b1 (diff) |
Merge branch 'ldap_migration'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
db/schema.rb
Diffstat (limited to 'CONTRIBUTING.md')
0 files changed, 0 insertions, 0 deletions