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 | |
| 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')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -16,7 +16,7 @@ gem "six" gem "therubyracer" gem "faker" gem "seed-fu", "~> 2.1.0" -gem "pygments.rb", "0.2.3" +gem "pygments.rb", "0.2.4" gem "thin" gem "git" gem "acts_as_list" |