5efaca77cf
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 |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |