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

+1 -1
View File
@@ -5,7 +5,7 @@ labels: enhancement
---
<!-- Please only use this template for submitting enhancement requests -->
<!--
Check already existing enhancement request on this list: https://github.com/kontena/lens/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement
Check already existing enhancement request on this list: https://github.com/lensapp/lens/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement
If similar request already exists, please add comments on the existing issue.
-->