Merge remote-tracking branch 'origin/feature/issue-2077' into feature/issue-2077

Browse Source

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

...

This commit is contained in:

Anna Bodnia

2016-06-17 11:24:50 +03:00

parent 8e60b0a7c4 a2ce3e797a

commit 5cc8af1114

2 changed files with 52 additions and 234 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

269

dist/swagger-ui.js vendored

File diff suppressed because one or more lines are too long

17

dist/swagger-ui.min.js vendored

File diff suppressed because one or more lines are too long