diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-10-21 00:37:13 -0700 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-10-21 00:37:13 -0700 |
commit | 5ec1ad8b2375bdce7a820df1be3dc67b18ad2bd0 (patch) | |
tree | 12954f5387748f6e590b917a55058aff63cbc059 /spec/models/snippet_spec.rb | |
parent | 51ef5b929708d3ad90b6db6afbb78ee24eeb8aa1 (diff) | |
parent | d4e3664067f330c7d070ee6c92b794cb50ff2d76 (diff) | |
download | gitlab-ce-5ec1ad8b2375bdce7a820df1be3dc67b18ad2bd0.tar.gz |
Merge pull request #1743 from riyad/fix-merging-bugs
Fix merging bugs
Diffstat (limited to 'spec/models/snippet_spec.rb')
0 files changed, 0 insertions, 0 deletions