24124766f4
Conflicts: Gemfile.lock config/locales/en.yml db/schema.rb |
||
---|---|---|
.. | ||
devise.en.yml | ||
devise.ru.yml | ||
en.yml | ||
event_log.en.yml | ||
event_log.ru.yml | ||
ru.yml | ||
wiki_welcome.en.yml | ||
wiki_welcome.ru.yml |