549f0a55e8
Conflicts: Gemfile.lock app/models/project.rb app/models/user.rb app/views/projects/_form.html.haml config/locales/ru.yml db/schema.rb |
||
---|---|---|
.. | ||
settings | ||
application_helper.rb | ||
comments_helper.rb | ||
commit_helper.rb | ||
diff_helper.rb | ||
git_helper.rb | ||
issues_helper.rb | ||
platforms_helper.rb | ||
projects_helper.rb | ||
subscribes_helper.rb | ||
wiki_helper.rb |