rosa-build/db
George Vinogradov a92282de1e Merge branch 'chipiga'
Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.haml
	config/locales/ru.yml
	db/schema.rb
2011-10-20 19:55:03 +04:00
..
migrate Merge branch 'chipiga' 2011-10-20 19:55:03 +04:00
schema.rb Merge branch 'chipiga' 2011-10-20 19:55:03 +04:00
seeds.rb fixed user seeds 2011-03-30 02:16:04 +04:00