Skip to content
Snippets Groups Projects
Commit 7a1d5b23 authored by Matthias Urhahn's avatar Matthias Urhahn
Browse files

Merge branch 'release/2.0.x' into feature/5062-event-registration-main 

# Conflicts:
#	gradle.properties
parents cecb72e0 f0986b1e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
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