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

This commit is contained in:
Wei Wang 2015-03-30 15:26:31 -07:00
commit 79e53c5f77
1 changed files with 1 additions and 1 deletions

View File

@ -4,7 +4,7 @@
"exclude": [ "exclude": [
"wwwroot" "wwwroot"
], ],
"bundleExclude": [ "publishExclude": [
"**.kproj", "**.kproj",
"**.user", "**.user",
"**.vspscc" "**.vspscc"