diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-09 07:27:56 +0200 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-09 07:27:56 +0200 |
commit | 444054629e31bd69ee697586348572998e93bdab (patch) | |
tree | 2a1753f85d5c14f72eaf701628e5e50b42cab328 /Gemfile | |
parent | 0e4858322bfc969bde1b02cab3113940654acf31 (diff) | |
parent | 737fb3608c92506a573a79f611b94ff5d5da18e6 (diff) | |
download | coderay-444054629e31bd69ee697586348572998e93bdab.tar.gz |
Merge branch 'master' into sass-scanner
Conflicts:
lib/coderay/scanners/css.rb
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -source :rubygems +source 'https://rubygems.org' # Specify your gem's dependencies in coderay.gemspec gemspec @@ -9,7 +9,7 @@ group :development do gem "bundler", ">= 1.0.0" gem "rake" gem "RedCloth", RUBY_PLATFORM == 'java' ? ">= 4.2.7" : ">= 4.0.3" - gem "term-ansicolor" + gem "term-ansicolor", '= 1.1.1' gem "shoulda-context", "~> 1.0.0" gem "json" if RUBY_VERSION < '1.9' gem "rdoc" |