Skip to content
Snippets Groups Projects
Commit 3c66cea5 authored by Daniel Plagge's avatar Daniel Plagge
Browse files

Merge branch 'feature/theory_plugin' into develop

Conflicts:
	de.prob.core/META-INF/MANIFEST.MF
	de.prob2.feature/feature.xml
parents 3fa41b02 700c4acc
No related branches found
No related tags found
Loading
Showing
with 498 additions and 28 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment