| commit | 9b6f0fe22fc3d6c671cc0dd26f20dc8c7c4451d9 | [log] [tgz] |
|---|---|---|
| author | Jinjiang <zhaojinjiang@me.com> | Mon Jul 11 12:46:57 2016 +0800 |
| committer | Jinjiang <zhaojinjiang@me.com> | Mon Jul 11 12:46:57 2016 +0800 |
| tree | 2b932044cf0365510be749ace2c288942701690f | |
| parent | d794a783fc4fdec4b75fc2a840e3fecbd8707c0b [diff] | |
| parent | 6f4c0850e9c8b8a7a3ebf4ababdf8eb982410736 [diff] |
Merge branch 'dev' into sourcemap
diff --git a/package.json b/package.json index 9150679..98eb683 100644 --- a/package.json +++ b/package.json
@@ -8,7 +8,7 @@ "type": "git", "url": "https://github.com/weexteam/weex-loader.git" }, - "licenses": "GPL", + "licenses": "GPL-3.0", "keywords": [ "weex", "loader",