Merge remote-tracking branch 'origin/open626' into open-master

This commit is contained in:
bwyu 2015-01-21 11:38:11 -08:00
commit 5c34382933

@ -26,9 +26,9 @@
<warSourceIncludes> <warSourceIncludes>
index.html, index.html,
*.json, *.json,
**/src/*, **/src/**/*,
**/res/*, **/res/**/*,
**/lib/*, **/lib/**/*,
**/bundle.json **/bundle.json
</warSourceIncludes> </warSourceIncludes>
<warSourceExcludes> <warSourceExcludes>