08994f3f60
Conflicts: app/assets/javascripts/merge_requests.js db/schema.rb |
||
---|---|---|
.. | ||
assets | ||
gitlabhq | ||
redcarpet/render | ||
tasks | ||
color.rb | ||
file_size_validator.rb | ||
gitlab_merge.rb | ||
graph_commit.rb | ||
post-receive-hook |
08994f3f60
Conflicts: app/assets/javascripts/merge_requests.js db/schema.rb |
||
---|---|---|
.. | ||
assets | ||
gitlabhq | ||
redcarpet/render | ||
tasks | ||
color.rb | ||
file_size_validator.rb | ||
gitlab_merge.rb | ||
graph_commit.rb | ||
post-receive-hook |