bf4e4f02ed
Conflicts: app/controllers/comments_controller.rb app/views/comments/edit.html.haml app/views/issues/show.html.haml 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 |