diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-25 21:36:30 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-25 21:36:30 +0300 |
| commit | 61c85332d2ab8545323a897724439526297c8899 (patch) | |
| tree | cd071f74570f543c08394e6fcae1029fa7894f23 /app/models/commit.rb | |
| parent | 5133541f25f91b83d17550983bd4cf93d39ae574 (diff) | |
| parent | 04a85f458214304b8d96a1ea052b40e171a3f2f5 (diff) | |
| download | gitlab-ce-61c85332d2ab8545323a897724439526297c8899.tar.gz | |
Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments
Conflicts:
app/controllers/admin/mailer_controller.rb
app/controllers/notes_controller.rb
Diffstat (limited to 'app/models/commit.rb')
0 files changed, 0 insertions, 0 deletions