Skip to content

chore: merge 2.0.x back into master #107

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 3 commits into from
May 25, 2018
Merged

chore: merge 2.0.x back into master #107

merged 3 commits into from
May 25, 2018

Conversation

tylerbrandt
Copy link
Contributor

No description provided.

Tyler Brandt added 3 commits May 24, 2018 15:33
# Conflicts:
#	packages/optimizely-sdk/CHANGELOG.MD
#	packages/optimizely-sdk/lib/utils/enums/index.js
#	packages/optimizely-sdk/package-lock.json
#	packages/optimizely-sdk/package.json
@tylerbrandt tylerbrandt merged commit ad3d3de into master May 25, 2018
@tylerbrandt tylerbrandt deleted the tyler/2.0.x-merge branch May 25, 2018 00:15
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