Skip to content

Commit 3ab609d

Browse files
committed
Merge branch 'patch-1' of https://github.com/fatiherikli/awesome-react into fatiherikli-patch-1
2 parents 2eb67a0 + 0a6b6eb commit 3ab609d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,12 +1037,16 @@ A collection of awesome things regarding React ecosystem.
10371037
* [Flux ImmutableJS TodoList](https://github.com/MandarinConLaBarba/flux-immutable-todomvc)
10381038
* [Hapi+React+Flux user management system](https://github.com/jedireza/aqua)
10391039
* [Redux TodoMVC](https://github.com/gaearon/redux/tree/master/examples/todomvc)
1040+
<<<<<<< HEAD
10401041
* [react-babel-webpack - CRUD demo app featuring React, React Router, Flux, Webpack, Bootstrap](https://github.com/arcseldon/react-babel-webpack-starter-app.git)
10411042

10421043

10431044
---
10441045
### Example Apps
10451046
* [isomorphic500 - Isomorphic JS app built with React and Fluxible](https://github.com/gpbl/isomorphic500)
1047+
=======
1048+
* [Fil: A playground for in-browser interpreters (Redux)](https://github.com/fatiherikli/fil)
1049+
>>>>>>> 0a6b6eb02d9f2225893955ee475fda4efae45a9d
10461050
10471051

10481052
---

0 commit comments

Comments
 (0)