Commit Graph

3 Commits

Author SHA1 Message Date
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
Alexander Machehin f1f6d1b78b [refs #114] email i18n 2012-01-22 22:19:00 +06:00
konstantin.grabar e3a716b7db [refs #105] Fix some translations 2012-01-20 15:29:32 +04:00