Skip to content

[All] Follow sofa master branch#108

Merged
jnbrunet merged 4 commits into
sofa-framework:masterfrom
fredroy:update_from_sofa_master
Feb 2, 2021
Merged

[All] Follow sofa master branch#108
jnbrunet merged 4 commits into
sofa-framework:masterfrom
fredroy:update_from_sofa_master

Conversation

@fredroy

@fredroy fredroy commented Jan 29, 2021

Copy link
Copy Markdown
Contributor

Coming from breaks with the includes and GUI PR mainly

@jnbrunet

jnbrunet commented Feb 1, 2021

Copy link
Copy Markdown
Contributor

Hey @fredroy , could you cherry-pick jnbrunet@1210fdd ? I don't have write access on your branch. It adds some more fixes.

We should also wait for sofa-framework/sofa#1767 to make sure the CI works again...

Signed-off-by: Jean-Nicolas Brunet <jnbrunet2000@gmail.com>
@fredroy

fredroy commented Feb 1, 2021

Copy link
Copy Markdown
Contributor Author

Hey @fredroy , could you cherry-pick jnbrunet@1210fdd ? I don't have write access on your branch. It adds some more fixes.

We should also wait for sofa-framework/sofa#1767 to make sure the CI works again...

done ! 🚀

@fredroy

fredroy commented Feb 2, 2021

Copy link
Copy Markdown
Contributor Author

needs SOFA #1768

@jnbrunet
jnbrunet merged commit b293cc4 into sofa-framework:master Feb 2, 2021
@guparan guparan added this to the v21.06 milestone Oct 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants