dfbf8a8d58
Fucking conflicts: app/controllers/projects/issues_controller.rb app/models/ability.rb app/views/projects/issues/show.html.haml config/routes.rb db/schema.rb lib/tasks/import.rake spec/models/comment_for_commit_spec.rb vendor/assets/javascripts/bootstrap-tab.js vendor/assets/stylesheets/bootstrap.css |
||
---|---|---|
.. | ||
ext | ||
modules/models | ||
plugins | ||
recipes | ||
tasks | ||
build_server.rb | ||
modules.rb | ||
plugins.rb | ||
product_builder.rb | ||
stub_xml_rpc.rb |