Alexander Machehin dfbf8a8d58 Merge branch 'master' into 90-pull ... 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		2012-09-25 17:55:30 +06:00
..
assets	Merge branch 'master' into 90-pull	2012-09-25 17:55:30 +06:00