Conflicts: app/views/projects/issues/show.html.haml db/fixtures/development/09_issues.rb db/fixtures/development/10_merge_requests.rb |
||
|---|---|---|
| .. | ||
| fixtures | ||
| migrate | ||
| schema.rb | ||
| seeds.rb | ||
Conflicts: app/views/projects/issues/show.html.haml db/fixtures/development/09_issues.rb db/fixtures/development/10_merge_requests.rb |
||
|---|---|---|
| .. | ||
| fixtures | ||
| migrate | ||
| schema.rb | ||
| seeds.rb | ||