Skip to content

Merged from develop_2.0 #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 13, 2015
Merged

Merged from develop_2.0 #425

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
75ac559
fix for #419
fehguy May 9, 2015
c262873
test for #419
fehguy May 9, 2015
0de4c68
linting
fehguy May 9, 2015
c698fdb
rebuilt
fehguy May 9, 2015
3f78168
fix, tests for https://github.com/swagger-api/swagger-ui/issues/1260
fehguy May 12, 2015
7e8f9f8
updated required props
fehguy May 13, 2015
4eb98d4
fix for #422
fehguy May 13, 2015
17f44b3
removed some cruft
fehguy May 13, 2015
1da2fa2
updated versions for release
fehguy May 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
updated versions for release
  • Loading branch information
@fehguy
fehguy committed May 13, 2015
commit 1da2fa24ae99f0456d8ff7601c839e1baade2b4b
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "swagger-js",
"version": "2.1.3-M2",
"version": "2.1.5-M2",
"main": "browser/swagger-client.js",
"ignore": [
"gulpfile.js",
Expand Down
2 changes: 1 addition & 1 deletion browser/swagger-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* swagger-client - swagger-client is a javascript client for use with swaggering APIs.
* @version v2.1.4-M2
* @version v2.1.5-M2
* @link http://swagger.io
* @license apache 2.0
*/
Expand Down
2 changes: 1 addition & 1 deletion browser/swagger-client.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"email": "[email protected]"
}],
"description": "swagger-client is a javascript client for use with swaggering APIs.",
"version": "2.1.4-M2",
"version": "2.1.5-M2",
"homepage": "http://swagger.io",
"repository": {
"type": "git",
Expand Down