Skip to content

Sync Master with Dev Branch #3

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 9 commits into from
May 18, 2017
Merged

Sync Master with Dev Branch #3

merged 9 commits into from
May 18, 2017

Conversation

sghoweri
Copy link
Collaborator

Prepping for 2.2 release -- syncing up changes so we've got a clean base to work off of. We'll need a separate PR in addition to this to get the Twig regex updates folded in before we release.

@sghoweri sghoweri added this to the v2.2 milestone May 17, 2017
@sghoweri sghoweri requested a review from EvanLovely May 17, 2017 23:52
@sghoweri sghoweri changed the title Sync Dev and Master Branches Sync Master with Dev Branch May 17, 2017
Copy link

@EvanLovely EvanLovely left a comment

Choose a reason for hiding this comment

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

👍

@EvanLovely EvanLovely merged commit 3c50e98 into dev May 18, 2017
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.

3 participants