Merge branch 'master' into fix-oauth2-issue

Browse Source

# Conflicts:
#	dist/swagger-ui.css

...

This commit is contained in:

Anna Bodnia

2017-04-26 17:53:53 +03:00

parent bb73dd49d8 ac25a5dac6

commit cecf0670b7

4 changed files with 36 additions and 3 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.css vendored

File diff suppressed because one or more lines are too long