Skip to content

Commit

Permalink
Merge 028c736 into 89ca90c
Browse files Browse the repository at this point in the history
  • Loading branch information
jopecko committed Sep 17, 2015
2 parents 89ca90c + 028c736 commit 8521090
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions examples/isomorphic-flux-chat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"author": "Jordan Garcia",
"license": "ISC",
"dependencies": {
"json-loader": "^0.5.3",
"keymirror": "^0.1.1",
"nuclear-js": "^1.1.1",
"nuclear-js-react-addons": "jordangarcia/nuclear-js-react-addons#051c39b10c4af9af7007216b06fccbdf79994529",
Expand Down
3 changes: 3 additions & 0 deletions examples/isomorphic-flux-chat/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ module.exports = [{
// don't try to load them ... just make the require calls not break
test: /\.css$/,
loader: 'css',
}, {
test: /\.json$/,
loader: "json-loader"
}],
},

Expand Down

0 comments on commit 8521090

Please sign in to comment.