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 |
||
---|---|---|
.. | ||
controllers | ||
factories | ||
helpers | ||
mailers | ||
models | ||
routing | ||
support | ||
tests.git | ||
spec_helper.rb |