fix server config options merge#920

dciccale wants to merge 1 commit into

angular-fullstack:masterangular-fullstack/generator-angular-fullstack:masterfrom

dciccale:fix-server-configCopy head branch name to clipboard