Justin Niessner 7721c59253 Merge from upstream/master and resolve merge conflicts.

2015-04-02 15:38:38 -04:00

..

root

Move webpack configs to tempates

2014-11-02 16:03:43 +03:00

_package.json

Merge from upstream/master and resolve merge conflicts.

2015-04-02 15:38:38 -04:00

_webpack.config.js

Merge from upstream/master and resolve merge conflicts.

2015-04-02 15:38:38 -04:00

_webpack.dist.config.js

Merge from upstream/master and resolve merge conflicts.

2015-04-02 15:38:38 -04:00

gitignore

Squashed commit of the following:

2014-05-15 19:52:23 +01:00

Gruntfile.js

Add and use Hot Module Replacement plugin and react-hot-loader

2014-09-27 19:23:34 +04:00

index.html

Use url-loader

2014-08-24 19:11:46 +02:00

karma.conf.js

Merge from upstream/master and resolve merge conflicts.

2015-04-02 15:38:38 -04:00