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

Merge branch 'release/1.11.x' into fix/DEV-merge-1.11.x-into-1.12.x 

# Conflicts:
#	gradle.properties
parents a1a0c6c5 945d650b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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