08994f3f60
Conflicts: app/assets/javascripts/merge_requests.js db/schema.rb |
||
---|---|---|
.. | ||
dev | ||
gitlab | ||
.gitkeep | ||
bulk_import.rake | ||
gitlab_enable_automerge.rake | ||
resque.rake | ||
travis.rake |
08994f3f60
Conflicts: app/assets/javascripts/merge_requests.js db/schema.rb |
||
---|---|---|
.. | ||
dev | ||
gitlab | ||
.gitkeep | ||
bulk_import.rake | ||
gitlab_enable_automerge.rake | ||
resque.rake | ||
travis.rake |