8000 Release v1.0 by jacebrowning · Pull Request #83 · flask-api/flask-api · GitHub
[go: up one dir, main page]

Skip to content

Release v1.0 #83

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 13 commits into from
Aug 29, 2017
Merged

Release v1.0 #83

merged 13 commits into from
Aug 29, 2017

Conversation

jacebrowning
Copy link
Member

No description provided.

@jacebrowning
Copy link
Member Author

v1.0 beta 1 is out there. I'll let this sit for a week and then release.

@jacebrowning jacebrowning self-assigned this Aug 22, 2017
flask_api/app.py Outdated
@@ -55,7 +55,7 @@ def make_response(self, rv):
headers, status_or_headers = status_or_headers, None

if not isinstance(rv, self.response_class):
if isinstance(rv, (text_type, bytes, bytearray, list, dict)):
if isinstance(rv, self.response_class.api_return_types):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this might have resulted from incorrectly resolving a merge conflict. Investigating...

@jacebrowning jacebrowning merged commit 08bf083 into master Aug 29, 2017
@jacebrowning jacebrowning deleted the release/v1.0 branch August 29, 2017 04:54
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.

2 participants
0