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 |
||
---|---|---|
.. | ||
_flashes.html.haml | ||
_javascripts.html.haml | ||
_stylesheets.html.haml | ||
application.html.haml | ||
sessions.html.haml |