Merge remote-tracking branch 'origin/master'

Qihoo360 · Jun 12, 2019 · 8b773c0 · 8b773c0
2 parents 4a3faab + a3ad367
commit 8b773c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
+branches:
+  only:
+    - master
 matrix:
   include:
     - language: go

diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",