tree 0e8f0ac8a6f0e33e477395a591c68c612e1be670
parent bb25ec370ec09823377544f3663fe8766ab392fe
parent 5f0782a6e7d0026e1405cdd47c0bd4b8f8579844
author Simon Reis <simon.reis@pta.de> 1602580052 +0200
committer Simon Reis <simon.reis@pta.de> 1602580052 +0200

Merge branch 'master' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.documentation

# Conflicts:
#	src/main/asciidoc/img/SIT_mapAppUsage.png
#	src/main/asciidoc/img/internet-liste.png
#	src/main/asciidoc/img/ort-adresse.png
#	src/main/asciidoc/img/ort-karte.png
#	src/main/asciidoc/img/verteilergruppe-anlegen-2.png
#	src/main/asciidoc/userDocumentation/userDocumentation.adoc