diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-08 11:07:15 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-08 11:07:15 +0200 |
commit | 5c4070131e46632b97a5a2e2680aacadf27681ab (patch) | |
tree | 03ea818f2374c46407061f49df061cb8090cc428 | |
parent | 589a98ca5edd82963a7b58007fd43c7218e523c8 (diff) | |
parent | 570655936306a39310c4d27bd7b85ec4ff1aa3ae (diff) | |
download | gitlab-ci-5c4070131e46632b97a5a2e2680aacadf27681ab.tar.gz |
Merge branch 'master' of github.com:gitlabhq/gitlab-ci
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c7d7135..db1fb87 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,7 @@ GEM descendants_tracker (~> 0.0.1) ice_nine (~> 0.9) backports (3.3.5) - bootstrap-sass (3.0.2.1) + bootstrap-sass (2.3.2.2) sass (~> 3.2) builder (3.0.4) capybara (2.1.0) |