Skip to content
Commit b23be448 authored by Christian Kniss's avatar Christian Kniss
Browse files

Merge branch 'develop' into 'master' 

NERZ: Umstellung auf Gradle, Build durch FTB und Bereitstellung auf NERZ-Repositories

See merge request !7
parents 8fadaaaa 9b1c266b
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