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

Merge branch 'release/2.1.x' into release/2.2.x

# Conflicts:
#	gradle.properties
parents 42134a63 85ca089f
No related branches found
No related tags found
Loading
Showing
with 172 additions and 97 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment