rosa-build/app/views/user_mailer
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
..
issue_assign_notification.en.haml [refs #105] Fix some translations 2012-01-20 15:29:32 +04:00
issue_assign_notification.ru.haml [refs #105] Fix some translations 2012-01-20 15:29:32 +04:00
new_comment_notification.en.haml Merge branch 'master' into 114-comment_notifications 2012-01-30 13:06:06 +06:00
new_comment_notification.ru.haml [refs #114] fix email bug 2012-01-25 13:21:41 +06:00
new_comment_reply_notification.en.haml [refs #105] Fix some translations 2012-01-20 15:29:32 +04:00
new_issue_notification.en.haml [refs #105] Fix some translations 2012-01-20 15:29:32 +04:00
new_issue_notification.ru.haml [refs #105] Fix some translations 2012-01-20 15:29:32 +04:00
new_user_notification.en.haml [refs #105] Fix some translations 2012-01-20 15:29:32 +04:00
new_user_notification.ru.haml [refs #105] Fix some translations 2012-01-20 15:29:32 +04:00