diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-26 10:38:40 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-26 10:38:40 +0200 |
| commit | d7b667fee238cfd457bdc143a37585ac931cf4ad (patch) | |
| tree | 81f5eb8aba67e9fb872c4aa736b7c148f912d79e /lib/api.rb | |
| parent | 0cc95ef2f56c4b779fca613c61789483fa8d2ae8 (diff) | |
| parent | 6d68923edceb23ae6a5281e022a351a0d9c0d59b (diff) | |
| download | gitlab-ce-d7b667fee238cfd457bdc143a37585ac931cf4ad.tar.gz | |
Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2
Conflicts:
app/models/merge_request.rb
Diffstat (limited to 'lib/api.rb')
0 files changed, 0 insertions, 0 deletions