644d57b420
Conflicts: Gemfile Gemfile.lock app/views/layouts/application.html.haml app/views/repositories/show.html.haml config/locales/ru.yml config/routes.rb db/schema.rb |
||
---|---|---|
.. | ||
_form.html.haml | ||
_list.html.haml | ||
_sidebar.html.haml | ||
edit.html.haml | ||
index.html.haml | ||
new.html.haml | ||
show.html.haml |