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

This commit is contained in:
Davis W. Frank
2011-06-21 20:11:10 -07:00
3 changed files with 2 additions and 16027 deletions

1
.gitignore vendored
View File

@@ -7,5 +7,6 @@ site/
.rvmrc .rvmrc
*.gem *.gem
.bundle .bundle
tags
Gemfile.lock Gemfile.lock
pkg/* pkg/*

View File

@@ -1,3 +1,4 @@
source :rubygems source :rubygems
gem "term-ansicolor", :require => "term/ansicolor" gem "term-ansicolor", :require => "term/ansicolor"
gem "json_pure", ">= 1.4.3"
gemspec gemspec

16027
tags

File diff suppressed because it is too large Load Diff