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 |
||
---|---|---|
.. | ||
_about_block.html.haml | ||
_branch_select.html.haml | ||
_layout.html.haml | ||
_repo_block.html.haml | ||
_sidebar.html.haml | ||
_submenu.html.haml |