Skip to content

Develop -> Master #480

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 7 commits into from
Jun 16, 2016
Merged

Develop -> Master #480

merged 7 commits into from
Jun 16, 2016

Conversation

amadeus
Copy link
Collaborator

@amadeus amadeus commented Jun 14, 2016

Some quick but important fixes from our last release.

@bounceme I assume you probably want to get an indent fix or two in here as well?

@bounceme
Copy link
Collaborator

yea, i'm going to need to test some more though

@bounceme
Copy link
Collaborator

if you are ready to merge you don't need to wait on my pr since I do think i'll need a day or two

@amadeus
Copy link
Collaborator Author

amadeus commented Jun 15, 2016

I'll wait for now, unless I see another issue regarding the issue that this fixes.

@bounceme
Copy link
Collaborator

bounceme commented Jun 15, 2016

tomorrow morning i'll merge my pr, after some more testing
edit:merged

@amadeus
Copy link
Collaborator Author

amadeus commented Jun 16, 2016

Ok, this has some fairly important fixes. Is this good to go?

@bounceme
Copy link
Collaborator

i think so.the last few commits are big improvements!

@amadeus amadeus merged commit d70bb4e into master Jun 16, 2016
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