Merge branch 'master' into selectable-themes

Conflicts:
	src/app/core/core.effects.ts
This commit is contained in:
lotte
2019-06-06 15:35:18 +02:00
93 changed files with 831 additions and 334 deletions

View File

@@ -58,7 +58,6 @@ export class AppComponent implements OnInit, AfterViewInit {
private angulartics2GoogleAnalytics: Angulartics2GoogleAnalytics,
private authService: AuthService,
private router: Router,
private routeService: RouteService,
private cssService: CSSVariableService,
private menuService: MenuService,
private windowService: HostWindowService,
@@ -78,8 +77,6 @@ export class AppComponent implements OnInit, AfterViewInit {
metadata.listenForRouteChange();
routeService.saveRouting();
if (config.debug) {
console.info(config);
}