Commit Graph

2 Commits

Author SHA1 Message Date
9b588a225c
Merge commit '96fd51f452bc9aa8eacc651cdf8726e58c9a56b7' into rel_4.x
# Conflicts:
#	docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md
2020-07-28 11:30:14 +02:00
442d64b42d Merge commit '8a38c8464f15f8f3ec3e076896295b58b16dbc71' as 'docs/daux' 2020-05-18 16:04:57 +02:00