diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-03 14:10:53 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-03 14:10:53 +0200 |
commit | e1c48f1431b5f7232747e608ee721b076765f12f (patch) | |
tree | f319817c2c78e923a0ee781d5b879a615a9f0ca1 /lib/api/api.rb | |
parent | bafd30f92cfb754fe6864c9cd595df10b52b11f2 (diff) | |
parent | d7c50b4a95b5530ae0e2f5249cfd9a419dd940c6 (diff) | |
download | gitlab-ce-e1c48f1431b5f7232747e608ee721b076765f12f.tar.gz |
Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
Diffstat (limited to 'lib/api/api.rb')
0 files changed, 0 insertions, 0 deletions