Merge pull request #44 from jumpserver/dev

Dev

Merge pull request #44 from jumpserver/dev
Dev
4b6f5c40 · 老广 · GitHub · 2f1d29d6 · eee7a4d0 · 4b6f5c40
Unverified Commit 4b6f5c40 authored Sep 04, 2018 by 老广 Committed by GitHub Sep 04, 2018
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

.gitignore .gitignore +1 -0

mock.py mock.py +0 -0

environment.prod.ts src/environments/environment.prod.ts +2 -2

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ Thumbs.db
 publish.sh
 luna.tar.gz
 luna/
+package-lock.json
--- a/mock.py
+++ b/mock.py
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -2,5 +2,5 @@ export const environment = {
  production: true
 };
 // export const version = '1.3.0-{{BUILD_NUMBER}} GPLv2.';
-// export const version = '1.3.3-101 GPLv2.';
-export const version = '1.3.3-{{BUILD_NUMBER}} GPLv2.';
+//  export const version = '1.3.3-101 GPLv2.';
+export const version = '1.4.1-{{BUILD_NUMBER}} GPLv2.';