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

View File

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