Skip to content

Commit

Permalink
Merge branch 'release/v1.1.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
kobalab committed Jul 14, 2019
2 parents 04f4093 + 6cec742 commit d614e01
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 2019-07-14 v1.1.6

- babel と mocha の使っているモジュール lodash に脆弱性がある問題に対処

### 2019-07-14 v1.1.5

- webpack の使ってるモジュール set-value と mixin-deep に脆弱性がある問題に対処
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "majiang",
"version": "1.1.5",
"version": "1.1.6",
"description": "HTML5 + JavaScript で動作する麻雀アプリ「電脳麻将」",
"main": "src/js/majiang.js",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion src/js/majiang.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"use strict";

module.exports = {
VERSION: '1.1.5',
VERSION: '1.1.6',
Shoupai: require('./majiang/shoupai'),
Shan: require('./majiang/shan'),
He: require('./majiang/he'),
Expand Down

0 comments on commit d614e01

Please sign in to comment.