Merge branch 'develop' into feature/Resurect_3D

# Conflicts:
#	angular.json
#	package-lock.json
#	package.json
#	projects/common-map/package.json
This commit is contained in:
Willem Dantuma
2020-09-26 12:17:58 +02:00
13 changed files with 5550 additions and 7591 deletions

View File

@@ -82,11 +82,7 @@ export const metaReducers: MetaReducer<any>[] = [debug];
EffectsModule.forRoot([])
],
providers: [
AuthConfigFactory,
{
provide:OAuthStorage,
useClass:SecureOAuthStorage
},
AuthConfigFactory,
{
provide:AuthConfigFactory,
useClass:Id4AuthconfigFactory