a92282de1e
Conflicts: app/controllers/application_controller.rb app/views/layouts/application.html.haml config/locales/ru.yml db/schema.rb |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |
a92282de1e
Conflicts: app/controllers/application_controller.rb app/views/layouts/application.html.haml config/locales/ru.yml db/schema.rb |
||
---|---|---|
.. | ||
migrate | ||
schema.rb | ||
seeds.rb |