Merge remote-tracking branch 'origin/master'

ConductionNL · Nov 13, 2019 · eb88357 · eb88357
2 parents 501574a + fff7e78
commit eb88357
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 78 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@
 api/helm/kubeconfig.yaml
 
 !/api/public/bundle/*
+
+.idea/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@
		api/helm/kubeconfig.yaml

		!/api/public/bundle/*

		.idea/