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 |
||
---|---|---|
.. | ||
deploy | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
assets.yml | ||
boot.rb | ||
compass.rb | ||
database.yml.sample | ||
deploy.rb | ||
environment.rb | ||
google.yml | ||
production.pill | ||
routes.rb | ||
schedule.rb | ||
unicorn.rb |