Skip to content
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

sync with develop & resolve merge conflict #25

Merged
merged 33 commits into from
Jul 9, 2015

Conversation

boegel
Copy link

@boegel boegel commented Jul 9, 2015

boegel and others added 30 commits June 5, 2015 09:08
…_constant

reset keep toolchain component class 'constants' every time
riccardomurri added a commit that referenced this pull request Jul 9, 2015
sync with develop & resolve merge conflict
@riccardomurri riccardomurri merged commit c648f8e into riccardomurri:gc3pie Jul 9, 2015
@boegel boegel deleted the gc3pie branch July 9, 2015 20:34
riccardomurri pushed a commit that referenced this pull request Mar 25, 2016
riccardomurri pushed a commit that referenced this pull request Mar 25, 2016
style fixes + add cleanup in broken test to fix it
riccardomurri pushed a commit that referenced this pull request Jan 12, 2018
prepare release notes for eb340
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.

3 participants