diff options
| author | Nathan Youngman <git@nathany.com> | 2012-10-27 23:52:58 -0600 |
|---|---|---|
| committer | Nathan Youngman <git@nathany.com> | 2012-10-27 23:52:58 -0600 |
| commit | 0392439f9aaa5dde7734743ab5a88193257ec722 (patch) | |
| tree | 3c13c9fa838ed11700353eee057e18a0a1ad8acf /Gemfile | |
| parent | 279348d3c2159df4ce6ac5949ada0177aa7c7159 (diff) | |
| parent | 3effca8291ed4941f7b3a1c2088b50274f28aa6f (diff) | |
| download | coderay-0392439f9aaa5dde7734743ab5a88193257ec722.tar.gz | |
Merge remote-tracking branch 'origin/master' into lua-scanner
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -8,7 +8,7 @@ gemspec group :development do gem "bundler", ">= 1.0.0" gem "rake", "~> 0.9.2" - gem "RedCloth", RUBY_PLATFORM == 'java' ? "= 4.2.7" : ">= 4.0.3" + gem "RedCloth", RUBY_PLATFORM == 'java' ? ">= 4.2.7" : ">= 4.0.3" gem "term-ansicolor" gem "shoulda-context", "~> 1.0.0" if RUBY_VERSION >= '1.8.7' gem "json" unless RUBY_VERSION >= '1.9.1' |