Skip to content

Conversation

@bounceme
Copy link
Collaborator

as per #314

@amadeus
Copy link
Collaborator

amadeus commented Apr 20, 2016

Can you rebase develop into this so we can get it merged in?

@bounceme bounceme force-pushed the patch-6 branch 2 times, most recently from 3f06a2c to 3743931 Compare April 20, 2016 23:42
@bounceme
Copy link
Collaborator Author

Is this better? It says there aren't any conflicts

@amadeus amadeus merged commit 20b0eb6 into pangloss:develop Apr 22, 2016
@amadeus
Copy link
Collaborator

amadeus commented Apr 22, 2016

Looks good, thanks!

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