Dandellion
/
matrix-wug
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into 'master' 

Develop

See merge request Dandellion/matrix-wug!14
This commit is contained in:
Daniel Løvbrøtte Olsen 2019-06-24 23:58:33 +00:00
parent 6ac0b87e0d e34de2f569
commit f27347d6ec
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.ts
View File

@ -1,4 +1,4 @@
const version = "2.3.0"; const version = "2.3.1";
import x2i from "./x2i"; import x2i from "./x2i";
import { existsSync } from "fs"; import { existsSync } from "fs";

6
package-lock.json generated
View File

@ -678,9 +678,9 @@
"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
}, },
"js-yaml": { "js-yaml": {
"version": "3.12.0", "version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"requires": { "requires": {
"argparse": "^1.0.7", "argparse": "^1.0.7",
"esprima": "^4.0.0" "esprima": "^4.0.0"

4
package.json
View File

@ -11,10 +11,10 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"matrix-bot-sdk": "^0.3.2", "matrix-bot-sdk": "^0.3.2",
"@types/js-yaml": "^3.11.2", "@types/js-yaml": "^3.12.1",
"@types/node": "^10.12.11", "@types/node": "^10.12.11",
"@types/xregexp": "^3.0.29", "@types/xregexp": "^3.0.29",
"js-yaml": "^3.12.0", "js-yaml": "^3.13.1",
"typescript": "^3.2.1", "typescript": "^3.2.1",
"xregexp": "^4.2.0" "xregexp": "^4.2.0"
} }