Merge branch 'master' into 3.0-features

This commit is contained in:
Steve Gravrock
2017-12-18 09:48:17 -08:00
9 changed files with 167 additions and 31 deletions

View File

@@ -1,7 +1,6 @@
<a name="README">[<img src="https://rawgithub.com/jasmine/jasmine/master/images/jasmine-horizontal.svg" width="400px" />](http://jasmine.github.io)</a>
[![Build Status](https://travis-ci.org/jasmine/jasmine.svg?branch=master)](https://travis-ci.org/jasmine/jasmine)
[![Code Climate](https://codeclimate.com/github/jasmine/jasmine.svg)](https://codeclimate.com/github/jasmine/jasmine)
# A JavaScript Testing Framework