Merge branch 'develop_2.0' into JSONEditor

Browse Source

Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/coffeescript/view/MainView.coffee
	src/main/coffeescript/view/OperationView.coffee
	src/main/coffeescript/view/ParameterView.coffee
	src/main/coffeescript/view/ResourceView.coffee
	src/main/coffeescript/view/SignatureView.coffee
	src/main/html/index.html

...

This commit is contained in:

laurent lepinay

2015-03-24 07:06:07 -07:00

parent 447b905132 0a6f913b1a

commit e7b7465335

76 changed files with 34309 additions and 8132 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

BIN

dist/images/explorer_icons.png vendored

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.6 KiB After Width:  |  Height:  |  Size: 5.6 KiB

BIN

dist/images/favicon-16x16.png vendored Executable file

Binary file not shown.

BIN

dist/images/favicon-32x32.png vendored Executable file

Binary file not shown.

BIN

dist/images/favicon.ico vendored Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.3 KiB

BIN

dist/images/logo_small.png vendored

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 770 B After Width:  |  Height:  |  Size: 769 B

BIN

dist/images/pet_store_api.png vendored

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 824 B After Width:  |  Height:  |  Size: 823 B

BIN

dist/images/wordnik_api.png vendored

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 980 B After Width:  |  Height:  |  Size: 979 B