Skip to content

Commit 8bea35c

Browse files
authored
Merge branch 'master' into zopflipng
2 parents 1be8da1 + 000df40 commit 8bea35c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+3396
-4103
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"rules": {
2323
"semi": [2, "never"],
2424
"strict": 0,
25-
"quotes": 2,
25+
"quotes": [2, "double", { "allowTemplateLiterals": true }],
2626
"no-unused-vars": 2,
2727
"no-multi-spaces": 1,
2828
"camelcase": 1,

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2017 SmartBear Software
1+
Copyright 2018 SmartBear Software
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Please disclose any security-related issues or vulnerabilities by emailing [secu
5252

5353
## License
5454

55-
Copyright 2017 SmartBear Software
55+
Copyright 2018 SmartBear Software
5656

5757
Licensed under the Apache License, Version 2.0 (the "License");
5858
you may not use this file except in compliance with the License.

dist/swagger-editor-bundle.js

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

dist/swagger-editor-bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-editor-standalone-preset.js

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

dist/swagger-editor-standalone-preset.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/swagger-editor.js

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

dist/swagger-editor.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/validation.worker.js

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

0 commit comments

Comments
 (0)