diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-02 15:22:31 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-02 15:22:31 -0800 |
commit | f00feb14ecba4f2efa0960d81b6085744517d4ed (patch) | |
tree | ebf6fcbad4b756d7f68ed25fdf54bfd589c3389d /lib/api | |
parent | 12581f15eeb7b60e966c89642233bb2a1d9306ee (diff) | |
parent | f84b7eef3f969a65d0930c9d62b6968b2ae70f12 (diff) | |
download | gitlab-ce-f00feb14ecba4f2efa0960d81b6085744517d4ed.tar.gz |
Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service
Conflicts:
app/controllers/projects/services_controller.rb
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions