Skip to content

Commit

Permalink
Merge branch 'master' into change-entry-to-preprocessor.js
Browse files Browse the repository at this point in the history
  • Loading branch information
martijnthe committed Nov 7, 2017
2 parents bad01ec + a4e32df commit 36e5f9c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -40,6 +40,7 @@ Orta Therox <orta.therox+gh@gmail.com>
Patrick Housley <patrick.f.housley@gmail.com>
Richard Silverton <richsilv@yahoo.co.uk>
Rikki Tooley <rikki.tooley@travellocal.com>
Thomas Fontaine <thomas.fontaine@me.com>
Tom Crockett <tomcrockett@tuplehealth.com>
Trivikram Kamat <trivikr.dev@gmail.com>
Umidbek Karimov <uma.karimov@gmail.com>
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -30,7 +30,6 @@ ts-jest is a TypeScript preprocessor with source map support for Jest that lets
- [tsconfig](#tsconfig)
- [Module path mapping](#module-path-mapping)
- [Using `.babelrc`](#using-babelrc)
- [Using `.babelrc`](#using-babelrc)
- [Using a custom Babel config](#using-a-custom-babel-config)
- [Use cases](#use-cases)
- [React Native](#react-native)
Expand Down

0 comments on commit 36e5f9c

Please sign in to comment.