diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-12 00:42:17 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-12 00:42:17 +0200 |
| commit | 6cf000ff52f34d0dd1afc823985adbe072c23515 (patch) | |
| tree | 1791a9570080429bd9ebafbceb0dbc51a23aedc2 /Gemfile.lock | |
| parent | c8b955a44b1897394d6dda349af2f183a820cc28 (diff) | |
| parent | 7f92534f767fa20357a11c63f973ae3b79cc5b85 (diff) | |
| download | gitlab-ce-6cf000ff52f34d0dd1afc823985adbe072c23515.tar.gz | |
Merge branch 'per_line_comment'
Conflicts:
app/assets/stylesheets/projects.css.scss
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 1bae641493b..10724c55028 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -145,8 +145,8 @@ GEM orm_adapter (0.0.5) polyglot (0.3.3) posix-spawn (0.3.6) - pygments.rb (0.2.3) - rubypython (>= 0.5.1) + pygments.rb (0.2.4) + rubypython (~> 0.5.3) rack (1.3.5) rack-cache (1.1) rack (>= 0.4) @@ -306,7 +306,7 @@ DEPENDENCIES kaminari launchy letter_opener - pygments.rb (= 0.2.3) + pygments.rb (= 0.2.4) rails (= 3.1.1) rails-footnotes (~> 3.7.5) rdiscount |