Skip to content

Master into develop #1

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 2 commits into from
Sep 4, 2016
Merged

Master into develop #1

merged 2 commits into from
Sep 4, 2016

Conversation

richmahn
Copy link
Member

@richmahn richmahn commented Sep 4, 2016

No description provided.

@richmahn richmahn merged commit 6b4e711 into develop Sep 4, 2016
ethantkoenig added a commit that referenced this pull request Sep 7, 2016
This reverts commit 6b4e711, reversing
changes made to 97a3c0c.
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