Merge remote-tracking branch 'newtriks/master'

Conflicts:
	README.md
This commit is contained in:
Chris committed 2015-05-26 10:15:03 +02:00
commit e90aaa46b6
10 files changed
+70 -21

No files matched your search

+3 -2
View File
@@ -72,11 +72,12 @@ ReactWebpackGenerator.prototype.askForArchitecture = function() {
this.prompt({
type : 'list',
name : 'architecture',
message : 'Would you like to use one of those architectures?',
message : 'Would you like to use one of these architectures?',
choices: [
{name:'No need for that, thanks',value:false},
{name:'Flux',value:'flux'},
{name:'ReFlux',value:'reflux'}
{name:'ReFlux',value:'reflux'},
{name:'Alt',value:'alt'}
],
default : false
}, function(props) {