Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update README.md for fork #2

Merged
merged 3 commits into from
Jun 24, 2016
Merged

Update README.md for fork #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae943dc
Add a note to README.md and DIVERGENCE.md to note differences from up…
marcusrbrown Jun 24, 2016
0dae0f2
Point the Travis CI badge to my fork.
marcusrbrown Jun 24, 2016
412f4ac
Update DIVERGENCE.md.
marcusrbrown Jun 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions DIVERGENCE.md
View file
Open in desktop
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
View file
Open in desktop
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