rosa-build/db
Alexander Machehin 5efaca77cf Merge branch 'master' into 114-comment_notifications
Conflicts:
	app/models/project.rb
	app/views/user_mailer/new_comment_notification.en.haml
	app/views/user_mailer/new_comment_notification.ru.haml
	app/views/user_mailer/new_comment_reply_notification.ru.haml
	config/locales/devise.en.yml
	config/locales/en.yml
	config/locales/ru.yml
	db/schema.rb
2012-01-30 13:06:06 +06:00
..
migrate Merge branch 'master' into 114-comment_notifications 2012-01-30 13:06:06 +06:00
schema.rb Merge branch 'master' into 114-comment_notifications 2012-01-30 13:06:06 +06:00
seeds.rb Remove non used arch 2011-11-02 12:22:27 +04:00