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
@@ -43,7 +43,7 @@ export const config = {
USER_MANAGEMENT_ENABLED: JSON.parse(process.env.USER_MANAGEMENT_ENABLED || "false"),
CHARTS_ENABLED: JSON.parse(process.env.CHARTS_ENABLED || "false"),
// kontena namespaces
// namespaces
LENS_NAMESPACE: process.env.LENS_NAMESPACE || "kontena-lens",
STATS_NAMESPACE: process.env.STATS_NAMESPACE || "kontena-stats",