OSDN Git Service

Merge branch 'bootstrap'
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sun, 29 Jan 2012 22:45:35 +0000 (00:45 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sun, 29 Jan 2012 22:45:35 +0000 (00:45 +0200)
commit8ebfae9a0770ce1ba5afa121a484f70ab9ce9110
tree007e2f528ac100b1f1c3478bb32782d8dcbeeb1e
parent6572d96bb5468b9cdf17c34aec83224ad1840369
parentb51252e6cac2e413e6e39b53964a57d1b29ac12f
Merge branch 'bootstrap'

Conflicts:
Gemfile
app/views/commits/_commits.html.haml
app/views/projects/empty.html.haml
Gemfile
Gemfile.lock
app/assets/stylesheets/commits.css.scss
app/models/commit.rb
app/views/devise/sessions/new.html.erb
config/routes.rb