Skip to content

Commit

Permalink
Merge pull request #2 from igetgames/update-readme-for-fork
Browse files Browse the repository at this point in the history
Update README.md for fork
  • Loading branch information
marcusrbrown committed Jun 24, 2016
2 parents f4eeaf8 + 412f4ac commit f921a26
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
10 changes: 10 additions & 0 deletions DIVERGENCE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## Differences from upstream [react-templates](https://github.com/wix/react-templates)

* [[PR]](igetgames/react-templates#1) Upgrade to React [v15.1.0](https://github.com/facebook/react/releases/tag/v15.1.0)

Based off of this [pull request](nippur72/react-templates#5), and I also updated the react and react-dom versions in package.json.

* [[PR]](igetgames/react-templates#2) Update README.md for fork

I changed the Travis CI badge in README.md to point to my fork, to better test changes not present in upstream.
I also added this document to note all of my changes.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
[![build status][travis-image]][travis-url]
[![Coverage Status][coveralls-image]][coveralls-url]

NOTE :warning: | This is a fork of the original (upstream) [react-templates](https://github.com/wix/react-templates) repository with additional changes and PRs merged. Please see the file [DIVERGENCE.md](DIVERGENCE.md) for a list of the changes from upstream.
---------------|-

# React Templates

Lightweight templates for [React](http://facebook.github.io/react/index.html).
Expand Down Expand Up @@ -632,8 +635,8 @@ Copyright (c) 2015 Wix. Licensed under the MIT license.

[npm-image]: https://img.shields.io/npm/v/react-templates.svg?style=flat-square
[npm-url]: https://npmjs.org/package/react-templates
[travis-image]: https://img.shields.io/travis/wix/react-templates/gh-pages.svg?style=flat-square
[travis-url]: https://travis-ci.org/wix/react-templates
[travis-image]: https://img.shields.io/travis/igetgames/react-templates/gh-pages.svg?style=flat-square
[travis-url]: https://travis-ci.org/igetgames/react-templates
[coveralls-image]: https://img.shields.io/coveralls/wix/react-templates/gh-pages.svg?style=flat-square
[coveralls-url]: https://coveralls.io/r/wix/react-templates?branch=gh-pages
[downloads-image]: http://img.shields.io/npm/dm/react-templates.svg?style=flat-square
Expand Down

0 comments on commit f921a26

Please sign in to comment.