Skip to content
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

add heroku tutorial #468

Merged
merged 4 commits into from
Jan 2, 2018
Merged

add heroku tutorial #468

merged 4 commits into from
Jan 2, 2018

Conversation

swyxio
Copy link

@swyxio swyxio commented Oct 6, 2017

as requested in #463

@thinkingserious thinkingserious added the status: code review request requesting a community code review or review from Twilio label Oct 6, 2017
@SendGridDX
Copy link
Collaborator

SendGridDX commented Oct 6, 2017

CLA assistant check
All committers have signed the CLA.

@swyxio
Copy link
Author

swyxio commented Oct 6, 2017

signed license agreement

@thinkingserious thinkingserious added difficulty: medium fix is medium in difficulty hacktoberfest labels Oct 20, 2017
@mbernier
Copy link
Contributor

@sw-yx Can you please look into the conflicts and merge them? Sorry we haven't gotten to this just yet - we are moving through everything as quickly as possible!

@mbernier
Copy link
Contributor

mbernier commented Nov 3, 2017

@sw-yx

We have not been able to merge your Pull Request, but because you are awesome - we wanted to make sure you could still get a SendGrid Hacktoberfest shirt.

Please go fill out our swag form before Nov 5th and we will send the shirt! (We know that you might have tried this before and it didn’t work, sorry about that!)

You have till Nov 5th to fill out this form in order to get the Hacktoberfest shirt!

Thank you for contributing during Hacktoberfest! We hope to see you in the repos soon! Just so you know, we always give away a SendGrid shirt for your first ever non-Hacktoberfest PR that gets merged.

@swyxio
Copy link
Author

swyxio commented Nov 3, 2017

ok sure. I think i resolved all conflicts btw!

@thinkingserious
Copy link
Contributor

Nice, thanks!

@@ -5546,6 +5546,12 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
"dev": true
},
"typescript": {
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure why this was added to this commit. Was this a mistake?

@thinkingserious
Copy link
Contributor

@sw-yx,

Could you please review my requested changes so that I can get this merged? :)

Thanks!

With Best Regards,

Elmer

@swyxio
Copy link
Author

swyxio commented Dec 27, 2017

Hey Elmer sorry for the delay in reply. holiday :) i was a noobie back then and commited the package lock change. i have undone that now, thank you.

@thinkingserious thinkingserious merged commit 3d44762 into sendgrid:master Jan 2, 2018
@thinkingserious
Copy link
Contributor

Hello @sw-yx,

Thanks again for the PR!

We appreciate your contribution and look forward to continued collaboration. Thanks!

Team SendGrid DX

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
difficulty: medium fix is medium in difficulty status: code review request requesting a community code review or review from Twilio
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants