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

Merge branch 'release/2.4.x' into release/2.5.x 

# Conflicts:
#	gradle.properties
parents 032b8fab 720c3474
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 7 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