Commit 5ac9f1cc authored by Patrick's avatar Patrick
Browse files

Merge branch 'master' of https://transfer.hft-stuttgart.de/gitlab/ugl/website.git

Conflicts:
	public/index.html
	readme.md
parents d47eca70 2f0ba2b5
Pipeline #3404 passed with stage
in 34 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