Merge branch 'development' into theslby/pushapi

This commit is contained in:
Unknown 2018-03-06 12:25:58 +00:00
commit 59cbc920c2
11 changed files with 384 additions and 14 deletions

View file

@ -82,6 +82,14 @@
</div>
</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/category-month']">
<div class="row no-gutters align-items-center">
<div class="col-2"><i class="icon-basket"></i></div>
<div class="col-10">Budget</div>
</div>
</a>
</li>
<li *ngIf="accountType == 'organisation'" class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/payroll-log']">
<div class="row no-gutters align-items-center">