Merge branch 'master' of github.com:pivotal/jasmine

jasmine · Jun 22, 2011 · e113c33 · e113c33
2 parents 67b6cfb + b81f690
commit e113c33
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16,027 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,6 @@ site/
 .rvmrc
 *.gem
 .bundle
+tags
 Gemfile.lock
 pkg/*
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,4 @@
 source :rubygems
 gem "term-ansicolor", :require => "term/ansicolor"
+gem "json_pure", ">= 1.4.3"
 gemspec