rosa-build/app/views/projects
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
..
base Merge branch 'master' into 90-pull 2012-09-25 17:55:30 +06:00
build_lists #633: removed checkbox from name of platform 2012-09-14 02:22:10 +04:00
collaborators [refs #263] use user fullname 2012-05-28 16:22:18 +06:00
comments Merge branch 'master' into 90-pull 2012-09-25 17:55:30 +06:00
git Merge branch 'master' into 90-pull 2012-09-25 17:55:30 +06:00
issues Merge branch 'master' into 90-pull 2012-09-25 17:55:30 +06:00
projects #641: added is_package checkbox to #new page, updated model 2012-09-12 19:06:34 +04:00
pull_requests Merge branch 'master' into 90-pull 2012-09-25 17:55:30 +06:00
wiki [refs #263] use user fullname 2012-05-28 16:22:18 +06:00