Merge branch '2_0'

src/html/HtmlReporter.js
2013-02-19 12:07:47 -08:00
parent 8b02bf731b f865758124
commit 83227f2163
87 changed files with 5701 additions and 8007 deletions
--- a/4
+++ b/4
@@ -1,11 +1,11 @@
 source :rubygems
 gem "rake"
-gem "jasmine", git: 'https://github.com/pivotal/jasmine-gem.git'
+gem "jasmine", :git => 'https://github.com/pivotal/jasmine-gem.git', :branch => '2_0'

 unless ENV["TRAVIS"]
  group :debug do
    gem 'debugger'
  end
 end
- 
+
 gemspec