2f5ce7cebe
Conflicts: app/models/ability.rb app/models/project.rb config/environments/production.rb |
||
---|---|---|
.. | ||
devise.en.yml | ||
devise.ru.yml | ||
en.yml | ||
event_log.ru.yml | ||
ru.yml |
2f5ce7cebe
Conflicts: app/models/ability.rb app/models/project.rb config/environments/production.rb |
||
---|---|---|
.. | ||
devise.en.yml | ||
devise.ru.yml | ||
en.yml | ||
event_log.ru.yml | ||
ru.yml |