rebase to master + resolve some conflicts

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Miska Kaipiainen authored and Jari Kolehmainen committed 2020-04-10 10:47:25 +03:00
1 parent 8b3acf2ded
commit dc3e3d90cc
32 files changed
+47 -47

No files matched your search

@@ -30,7 +30,7 @@
align-self: center;
.LineProgress {
color: $kontenaBlue;
color: $lensBlue;
}
}
@@ -38,7 +38,7 @@
align-self: center;
.LineProgress {
color: $kontenaMagenta;
color: $lensMagenta;
}
}