rosa-build/db
Alexander Machehin 36b4ce2d99 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/projects/issues_controller.rb
	app/models/project.rb
	config/locales/menu.en.yml
	config/routes.rb
	db/schema.rb
2012-05-03 23:19:43 +06:00
..
migrate Merge branch 'master' into 90-pull 2012-05-02 23:08:24 +06:00
schema.rb Merge branch 'master' into 90-pull 2012-05-03 23:19:43 +06:00
seeds.rb [Refs #263] Delete Categories 2012-03-29 23:01:25 +04:00