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

Merge maintenance/MPS-2022.2 into maintenance/MPS-2022.3 #105

Merged
merged 14 commits into from
Jul 25, 2024

Conversation

mps-ci-buildbot
Copy link
Contributor

Merge changes from maintenance/MPS-2022.2 to maintenance/MPS-2022.3.

…ge/MPS-2022.3

# Conflicts:
#	code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/com.mbeddr.formal.safety.argument.jira_integration.mpl
#	code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.argument.jira_integration/models/com.mbeddr.formal.safety.argument.jira_integration.util.mps
#	code/languages/com.mpsbasics/languages/com.mpsbasics.jira/com.mpsbasics.jira.mpl
#	code/languages/com.mpsbasics/languages/com.mpsbasics.jira/models/com.mpsbasics.jira.constraints.mps
#	code/languages/com.mpsbasics/solutions/com.mpsbasics.jira.pluginSolution/com.mpsbasics.jira.pluginSolution.msd
#	code/languages/com.mpsbasics/solutions/com.mpsbasics.jira.sandbox/com.mpsbasics.jira.sandbox.msd
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd
#	gradle.lockfile
@danielratiu danielratiu merged commit c3a107c into maintenance/MPS-2022.3 Jul 25, 2024
2 of 3 checks passed
@danielratiu danielratiu deleted the merge/MPS-2022.3 branch July 25, 2024 21:33
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