Skip to content

Develop -> Master#480

Merged
amadeus merged 7 commits into
masterfrom
develop
Jun 16, 2016
Merged

Develop -> Master#480
amadeus merged 7 commits into
masterfrom
develop

Conversation

@amadeus

@amadeus amadeus commented Jun 14, 2016

Copy link
Copy Markdown
Collaborator

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
Copy Markdown
Collaborator

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

@bounceme

Copy link
Copy Markdown
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

amadeus commented Jun 15, 2016

Copy link
Copy Markdown
Collaborator Author

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

@bounceme

bounceme commented Jun 15, 2016

Copy link
Copy Markdown
Collaborator

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

@amadeus

amadeus commented Jun 16, 2016

Copy link
Copy Markdown
Collaborator Author

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

@bounceme

Copy link
Copy Markdown
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