Merge branch 'master' of https://github.com/swagger-api/swagger-ui

Browse Source

# Conflicts:
#	dist/swagger-ui.js
#	dist/swagger-ui.min.js

...

This commit is contained in:

Guido Josquin

2016-05-02 15:06:37 +02:00

parent 918aed94d6 0d1fda51eb

commit 9bbb42eb48

5 changed files with 5 additions and 5 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

2

dist/swagger-ui.min.js vendored

File diff suppressed because one or more lines are too long