diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-30 00:45:35 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-30 00:45:35 +0200 |
| commit | 8ebfae9a0770ce1ba5afa121a484f70ab9ce9110 (patch) | |
| tree | 007e2f528ac100b1f1c3478bb32782d8dcbeeb1e /Gemfile | |
| parent | 6572d96bb5468b9cdf17c34aec83224ad1840369 (diff) | |
| parent | b51252e6cac2e413e6e39b53964a57d1b29ac12f (diff) | |
| download | gitlab-ce-8ebfae9a0770ce1ba5afa121a484f70ab9ce9110.tar.gz | |
Merge branch 'bootstrap'
Conflicts:
Gemfile
app/views/commits/_commits.html.haml
app/views/projects/empty.html.haml
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -29,6 +29,7 @@ gem "httparty" gem "charlock_holmes" gem "foreman" gem "omniauth-ldap" +gem 'bootstrap-sass' group :assets do gem "sass-rails", "~> 3.1.0" |