Commit e9d7307e authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'develop' into '79-add-viktor-to-humans-txt'

# Conflicts:
#   html/humans.txt
parents 05a936e9 e9747512
Pipeline #1597 passed with stages
in 4 minutes and 58 seconds
......@@ -14,6 +14,10 @@
Twitter: @kynsuperhero
From: Hannover, Germany
Developer: Lukas Raschke
Twitter: @RaLu_92
From: Stuttgart, Germany
/* THANKS */
<role>: <name>
Twitter: @<yourname>
Markdown is supported
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