Merge branch 'docker-develop' into develop

kosmas58 · Aug 6, 2018 · aeed34e · aeed34e
2 parents 8770b34 + 0b5cae1
commit aeed34e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
     "@angular/language-service": "~6.1.1",
     "@types/node": "~10.5.6",
     "codelyzer": "~4.4.2",
+    "hoek": "^4.2.1",
     "jasmine": "~3.1.0",
     "jasmine-core": "~3.1.0",
     "jasmine-spec-reporter": "~4.2.1",

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -6,6 +6,6 @@
 export const environment = {
   name: 'development',
   production: false,
-  version: 'de DEV',
+  version: '1.6.3.11',
   rollbar_key: ''
 };