Norbert de Langen 1eab404f54
Merge branch 'next' into tech/core-builder
# Conflicts:
#	app/html/src/server/options.ts
#	app/vue3/src/server/options.ts
#	app/web-components/src/server/options.ts
#	lib/core-server/src/__snapshots__/angular-cli_manager-dev
#	lib/core-server/src/__snapshots__/angular-cli_manager-prod
#	lib/core-server/src/__snapshots__/angular-cli_preview-dev
#	lib/core-server/src/__snapshots__/angular-cli_preview-prod
#	lib/core/src/server/core-presets.test.ts
2021-02-19 18:18:39 +01:00
..