Skip to content
Snippets Groups Projects
Commit febd15f3 authored by Frank Fischer's avatar Frank Fischer
Browse files

Merge branch 'master' of gitlab.ekp.kit.edu:mschnepf/jdl_creator 

Conflicts:
	classes/JDLCreator.py
	create_jdl.py
parents 06de4606 d277d5f6
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment