Skip to content

Merged from develop_2.0 #471

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.

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 82 commits into from
Jun 5, 2015
Merged

Merged from develop_2.0 #471

merged 82 commits into from
Jun 5, 2015

Conversation

fehguy
Copy link
Contributor

@fehguy fehguy commented Jun 5, 2015

No description provided.

fehguy and others added 28 commits June 5, 2015 00:33
options.authorizations can now be set in the contructor, and in
initialize.

lib/auth tests now use nock, instead of a test server.
…son-if-we-can

default to application/json if we can
…swagger-js into ponelat-fix/auth-for-initial-spec
fehguy added a commit that referenced this pull request Jun 5, 2015
@fehguy fehguy merged commit 8545f78 into master Jun 5, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants