diff options
author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-27 13:19:35 +0200 |
---|---|---|
committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-27 13:19:35 +0200 |
commit | bb8c1cadf39415d2f916d135e8bbfdce49842f2f (patch) | |
tree | f3529e2f355153909b464d882b4ae50d76e9f659 /Gemfile.lock | |
parent | 5b69b2686fe9bbbea34f26823e09a991b9d552cc (diff) | |
parent | 76e720dfa94f8dc8daf1544f571be60990b79da8 (diff) | |
download | gitlab-ce-bb8c1cadf39415d2f916d135e8bbfdce49842f2f.tar.gz |
Merge pull request #9209 from Soullivaneuh/bootstrap-update
Bootstrap 3.3.4
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2260beb0a5e..0f965d7b542 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,7 +47,7 @@ GEM astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) attr_required (1.0.0) - autoprefixer-rails (5.1.6) + autoprefixer-rails (5.1.11) execjs json awesome_print (1.2.0) @@ -60,7 +60,7 @@ GEM erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.3) + bootstrap-sass (3.3.4.1) autoprefixer-rails (>= 5.0.0.1) sass (>= 3.2.19) brakeman (3.0.1) @@ -154,7 +154,7 @@ GEM escape_utils (0.2.4) eventmachine (1.0.4) excon (0.32.1) - execjs (2.0.2) + execjs (2.5.2) expression_parser (0.9.0) factory_girl (4.3.0) activesupport (>= 3.0.0) |