Commit 5e05ed65 authored by Julian Dierkes's avatar Julian Dierkes
Browse files

Merge branch 'master' of...

Merge branch 'master' of git.rwth-aachen.de:monticore/EmbeddedMontiArc/languages/CNNArchLang into develop
parents c995579f 54931a04
Pipeline #265434 passed with stage
in 9 minutes and 53 seconds