diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-19 11:01:19 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-19 11:01:19 +0200 |
| commit | 155703c6132a86c13a18dba65da19129f49ea9c9 (patch) | |
| tree | 621b90b97ad824e19f31152967d6e8ffd4a05b09 /lib/api/notes.rb | |
| parent | 52028dcd2d5a4048a6751312c6f1eba49013ce22 (diff) | |
| parent | 6e333d507565a63037e9f4142a29138efa530971 (diff) | |
| download | gitlab-ce-155703c6132a86c13a18dba65da19129f49ea9c9.tar.gz | |
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions