Skip to content
Snippets Groups Projects
Commit 2177b607 authored by Goik Martin's avatar Goik Martin
Browse files

Merge

Merge branch 'master' of https://version.mi.hdm-stuttgart.de/git/GoikLectures

Conflicts:
	Doc/course.xml
parents 6a951c0e d6323b6e
No related branches found
No related tags found
No related merge requests found
Showing
No files found.
with 0 additions and 0 deletions
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment