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

2011-06-21 20:11:10 -07:00
parent 67b6cfb828 b81f690a25
commit e113c338d0
3 changed files with 2 additions and 16027 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,6 @@ site/
 .rvmrc
 *.gem
 .bundle
+tags
 Gemfile.lock
 pkg/*
--- a/1
+++ b/1
@@ -1,3 +1,4 @@
 source :rubygems
 gem "term-ansicolor", :require => "term/ansicolor"
+gem "json_pure", ">= 1.4.3"
 gemspec
--- a/16027
+++ b/16027