Skip to content
Snippets Groups Projects
Commit 58ad4788 authored by René Schöne's avatar René Schöne
Browse files

Merge branch 'master' into dev 

# Conflicts:
#	ragconnect.base/src/main/resources/ragConnectVersion.properties
parents 937aae40 79766203
No related branches found
No related tags found
3 merge requests!39Version 1.1.0,!35Version 1.0.0,!17Version 0.3.2
Pipeline #9962 passed
Stage: build
Stage: test
Stage: ragdoc_build
Stage: ragdoc_view