Merge branch 'master' into webpack-migration-2.x

Browse Source

# Conflicts:
#	dist/swagger-ui-bundle.js
#	dist/swagger-ui-bundle.js.map
#	dist/swagger-ui-standalone-preset.js
#	dist/swagger-ui-standalone-preset.js.map
#	dist/swagger-ui.js
#	dist/swagger-ui.js.map
#	package.json
#	webpack-dist.config.js
#	webpack-hot-dev-server.config.js

...

This commit is contained in:

RVKen

2017-06-28 18:40:52 +02:00

parent e81eee00aa 10c35c4be3

commit 4b85dc55d3

32 changed files with 283 additions and 101 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

6

dist/swagger-ui-standalone-preset.js vendored

File diff suppressed because one or more lines are too long