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

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

..

Action.js

Switch the generation of everything so we generate tests and they can actually pass.

2015-03-26 23:09:45 -04:00

App.js

Moved normalize.css to dependencies

2015-03-31 18:42:16 +03:00

Component.js

Use provided 'style' alias within Component file

2015-02-20 16:56:43 +03:00

Dispatcher.js

Add flux support including generators

2015-03-25 22:42:02 -04:00

main.js

Adding 'use strict' to main.js

2015-03-06 00:12:38 -03:00

Store.js

Switch the generation of everything so we generate tests and they can actually pass.

2015-03-26 23:09:45 -04:00