Skip to content

Commit cb8a11a

Browse files
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents f92276b + c0578bf commit cb8a11a

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

js/.npmignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
ts-test
2-
misc
1+
coverage
32
demo
3+
misc
4+
ts-test
45
sample.*
56
*.tgz

js/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "qrcode-generator",
3-
"version": "1.5.0",
3+
"version": "2.0.0",
44
"description": "QR Code Generator implementation in JavaScript.",
55
"author": "Kazuhiko Arase",
66
"license": "MIT",

0 commit comments

Comments
 (0)