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

Update Mocha link #304

Merged
merged 2 commits into from Mar 1, 2017

Conversation

Projects
None yet
2 participants
@mortonfox
Contributor

mortonfox commented Feb 10, 2017

No description provided.

@jebeck

This comment has been minimized.

Show comment
Hide comment
@jebeck

jebeck Mar 1, 2017

Collaborator

Hi @mortonfox, sorry for the slow response here. Thanks for this change!

Hopefully this next request isn't too onerous - could you please update this branch with a merge from master (first git pull origin master in your local fork, then checkout your patch-1 and git merge master - apologies if this is already familiar and I'm over-explaining...).

Then could you also follow the instructions here to agree to our Volunteer/Contributor License Agreement? We need that as well before we can merge (but you only have to do it once!)

If you're interested in Tidepool's data visualization code, just FYI this repository is slowly going to be deprecated in favor of viz.

Collaborator

jebeck commented Mar 1, 2017

Hi @mortonfox, sorry for the slow response here. Thanks for this change!

Hopefully this next request isn't too onerous - could you please update this branch with a merge from master (first git pull origin master in your local fork, then checkout your patch-1 and git merge master - apologies if this is already familiar and I'm over-explaining...).

Then could you also follow the instructions here to agree to our Volunteer/Contributor License Agreement? We need that as well before we can merge (but you only have to do it once!)

If you're interested in Tidepool's data visualization code, just FYI this repository is slowly going to be deprecated in favor of viz.

@mortonfox

This comment has been minimized.

Show comment
Hide comment
@mortonfox

mortonfox Mar 1, 2017

Contributor

I agree to the terms of Tidepool Project’s Volunteer/Contributor License Agreement v1.0 as it exists at http://tidepool-org.github.io/files/TidepoolVCLA.pdf on March 1, 2017.

Contributor

mortonfox commented Mar 1, 2017

I agree to the terms of Tidepool Project’s Volunteer/Contributor License Agreement v1.0 as it exists at http://tidepool-org.github.io/files/TidepoolVCLA.pdf on March 1, 2017.

@mortonfox

This comment has been minimized.

Show comment
Hide comment
@mortonfox

mortonfox Mar 1, 2017

Contributor

And also, I've merged the upstream master into patch-1.

Contributor

mortonfox commented Mar 1, 2017

And also, I've merged the upstream master into patch-1.

@jebeck

This comment has been minimized.

Show comment
Hide comment
@jebeck

jebeck Mar 1, 2017

Collaborator

Thanks!

Collaborator

jebeck commented Mar 1, 2017

Thanks!

@jebeck

jebeck approved these changes Mar 1, 2017

@jebeck jebeck merged commit bbe637a into tidepool-org:master Mar 1, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment