Skip to content
GitLab
Commit f2fef639 authored by Alfakhori's avatar Alfakhori
Browse files

Merge branch 'master' into 'amando.reber-master-patch-13320' 

# Conflicts:
#   public/data/pins.csv
parents 4b6a2df8 baac954c
This commit is part of merge request !2. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal