diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2011-12-27 04:08:29 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2011-12-27 04:08:29 +0100 |
| commit | 2afe23ab0a3d17b50f55750241a682403ced4fc8 (patch) | |
| tree | 19708f1d79ce22eed6b0e90de4760a8cfcc9504b /Gemfile | |
| parent | c044a7a6eaba9ba47b8fde2cd6bdd444d8f87062 (diff) | |
| parent | 9c3837e0086ca07f241e9cc74c9fabbeb2d39987 (diff) | |
| download | coderay-2afe23ab0a3d17b50f55750241a682403ced4fc8.tar.gz | |
Merge branch 'master' into multiline-inline-diff
Conflicts:
coderay.gemspec
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -10,7 +10,7 @@ group :development do gem "rake", "~> 0.9.2" gem "RedCloth", RUBY_PLATFORM == 'java' ? "= 4.2.7" : ">= 4.0.3" gem "term-ansicolor" - gem "shoulda-context", "= 1.0.0.beta1" if RUBY_VERSION >= '1.8.7' + gem "shoulda-context", "~> 1.0.0" if RUBY_VERSION >= '1.8.7' gem "json" unless RUBY_VERSION >= '1.9.1' gem "rdoc" if RUBY_VERSION >= '1.8.7' end |