summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-14 12:58:43 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-14 12:58:43 +0200
commit1ec106b853cf2b3aa7c8fa29e24d1f429df2f0a8 (patch)
treed310c675e58ca8c9f7ffa6d2da186036366fd518 /lib/api
parentbce8edbbcc03bd29230124f9d7871dabbc79d38f (diff)
parent48e9054056db7f14bdef0d2d5c859f357110ed95 (diff)
downloadgitlab-ce-1ec106b853cf2b3aa7c8fa29e24d1f429df2f0a8.tar.gz
Merge branch 'ldap_connections'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions