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

fixes #358 #371

Merged
merged 9 commits into from Oct 21, 2016

Conversation

Projects
None yet
3 participants
@daren-thomas
Contributor

daren-thomas commented Oct 17, 2016

see the discussion on the issue for more information

@JIMENOFONSECA

This comment has been minimized.

Show comment
Hide comment
@JIMENOFONSECA

JIMENOFONSECA Oct 21, 2016

Contributor

@daren-thomas there is a conflict in this branch

Contributor

JIMENOFONSECA commented Oct 21, 2016

@daren-thomas there is a conflict in this branch

@daren-thomas

This comment has been minimized.

Show comment
Hide comment
@daren-thomas

daren-thomas Oct 21, 2016

Contributor

@JIMENOFONSECA you can probably merge this now.

Contributor

daren-thomas commented Oct 21, 2016

@JIMENOFONSECA you can probably merge this now.

@JIMENOFONSECA JIMENOFONSECA merged commit c4cff10 into master Oct 21, 2016

1 check passed

default Build finished.
Details

@JIMENOFONSECA JIMENOFONSECA deleted the i358-replace-calc_t_em_ls branch Apr 12, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment