Merge with master

This commit is contained in:
ziajka
2019-01-23 09:09:14 +01:00
377 changed files with 6433 additions and 6358 deletions

View File

@ -1,10 +1,8 @@
<header>
<mat-toolbar color="primary">
<button mat-icon-button>
<mat-icon svgIcon="gns3"></mat-icon>
</button>
<button mat-icon-button><mat-icon svgIcon="gns3"></mat-icon></button>
<button mat-button routerLink="/servers" >Servers</button>
<button mat-button routerLink="/servers">Servers</button>
<span class="fill-space"></span>
@ -27,9 +25,7 @@
</mat-toolbar>
</header>
<main class="mat-app-background">
<router-outlet></router-outlet>
</main>
<main class="mat-app-background"><router-outlet></router-outlet></main>
<app-progress></app-progress>