Commit 24d2e5b0 authored by Jean-Marc Ronck's avatar Jean-Marc Ronck
Browse files

Merge branch 'master' into 'bugfixes'

# Conflicts:
#   pom.xml
#   src/main/java/de/monticore/lang/monticar/mpp/montimath/
#   src/main/resources/templates/script.ftl
parents bda3c973 6aa36adc
Pipeline #76335 passed with stages
in 3 minutes and 5 seconds
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment