Merge remote-tracking branch 'origin/release' into dev

This commit is contained in:
Wei Wang 2015-03-30 15:32:56 -07:00
commit 4f357411aa
2 changed files with 2 additions and 2 deletions

View File

@ -15,7 +15,7 @@
"dnx451": {}, "dnx451": {},
"dnxcore50": {} "dnxcore50": {}
}, },
"bundleExclude": [ "publishExclude": [
"node_modules", "node_modules",
"bower_components", "bower_components",
"**.kproj", "**.kproj",

View File

@ -15,7 +15,7 @@
"dnx451": {}, "dnx451": {},
"dnxcore50": {} "dnxcore50": {}
}, },
"bundleExclude": [ "publishExclude": [
"node_modules", "node_modules",
"bower_components", "bower_components",
"**.kproj", "**.kproj",