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.

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

Jump to bottom

Merge branch 'master' into dev #5832

Merged
merged 5 commits into from
Apr 20, 2018
Merged

Merge branch 'master' into dev #5832

merged 5 commits into from
Apr 20, 2018

Conversation

joelverhagen
Copy link
Member

This just pulls in hotfix #5793.

@joelverhagen joelverhagen requested review from ryuyu and skofman1 April 20, 2018 21:03
@joelverhagen
Copy link
Member Author

I need this to merge #5828 into dev branch since the author based it off of master instead of dev. I could ask the author to rebase on dev but this needs to happen anyway.

/cc @ryuyu @skofman1

@joelverhagen joelverhagen merged commit 26bc59a into dev Apr 20, 2018
@joelverhagen joelverhagen deleted the jver-merge-master branch April 20, 2018 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryuyu ryuyu ryuyu approved these changes

@skofman1 skofman1 skofman1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@joelverhagen @ryuyu @skofman1 @cristinamanum