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

Revert "Merge branch 'master' into stable/1.0.x" #154

Merged
merged 1 commit into from
Oct 19, 2020

Conversation

stevenbal
Copy link
Collaborator

This reverts commit ac9a5e4, reversing
changes made to 46d639d.

This reverts commit ac9a5e4, reversing
changes made to 46d639d.
@stevenbal stevenbal merged commit 152af41 into stable/1.0.x Oct 19, 2020
@stevenbal stevenbal deleted the issue/fix-merge-conflicts branch October 19, 2020 10:21
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.

1 participant