Merge branch 'viviangb-master'

This commit is contained in:
Audrey Roy Greenfeld 2016-06-03 18:07:47 -07:00
commit 87e35817cf

View File

@ -20,6 +20,7 @@
"use_python2": "n", "use_python2": "n",
"use_docker": "y", "use_docker": "y",
"use_heroku": "n", "use_heroku": "n",
"use_angular": "n",
"js_task_runner": ["Gulp", "Grunt", "None"], "js_task_runner": ["Gulp", "Grunt", "None"],
"open_source_license": ["MIT", "BSD", "Apache Software License 2.0", "Not open source"] "open_source_license": ["MIT", "BSD", "Apache Software License 2.0", "Not open source"]
} }