Merge branch 'develop'

Gaia3D · Apr 26, 2019 · 7ee7d5c · 7ee7d5c
2 parents bbfc7fa + 643ee66
commit 7ee7d5c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9,957 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,3 +10,4 @@ script: gulp
 branches : 
   only : 
     - master
+    - /^greenkeeper/.*$/
diff --git a/README.md b/README.md
@@ -1,8 +1,10 @@
 ![Build Status](https://travis-ci.org/Gaia3D/mago3djs.svg?branch=master)
 [![License](https://img.shields.io/badge/License-Apache%202.0-brightgreen.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+[![Greenkeeper badge](https://badges.greenkeeper.io/Gaia3D/mago3djs.svg)](https://greenkeeper.io/)
+
 [![Korean](https://img.shields.io/badge/language-Korean-blue.svg)](#korean)
 [![Englsh](https://img.shields.io/badge/language-English-orange.svg)](#english)
-[![Japan](https://img.shields.io/badge/language-Japan-red.svg)](#japan)
+[![Japan](https://img.shields.io/badge/language-Japan-red.svg)](#japan) 
 
 <a name="korean"></a>
 

diff --git a/greenkeeper.json b/greenkeeper.json
@@ -0,0 +1,10 @@
+{
+  "groups": {
+    "default": {
+      "packages": [
+        "externlib/jquery-toast/package.json",
+        "package.json"
+      ]
+    }
+  }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ script: gulp @@
     branches :
       only :
         - master
+        - /^greenkeeper/.*$/