7d74b0af13
Conflicts: Gemfile Gemfile.lock app/models/group.rb app/views/layouts/application.html.haml db/schema.rb public/stylesheets/git/style.css |
||
---|---|---|
.. | ||
devise.en.yml | ||
devise.ru.yml | ||
en.yml | ||
event_log.en.yml | ||
event_log.ru.yml | ||
menu.en.yml | ||
menu.ru.yml | ||
ru.yml | ||
wiki_welcome.en.yml | ||
wiki_welcome.ru.yml |