Merge remote-tracking branch 'origin/issue-1186' into issue-1186

Browse Source

# Conflicts:
#	dist/swagger-ui.js
#	dist/swagger-ui.min.js
#	src/main/javascript/helpers/handlebars.js

...

This commit is contained in:

Anna Bodnia

2016-02-22 19:01:18 +02:00

parent 256583bdb5 0dd6cde608

commit 004ac2d6ae

3 changed files with 677 additions and 691 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

1339

dist/swagger-ui.js vendored

File diff suppressed because one or more lines are too long

22

dist/swagger-ui.min.js vendored

File diff suppressed because one or more lines are too long