Commit daa47dec authored by Alexander Ryndin's avatar Alexander Ryndin
Browse files

Merge branch 'master' into ryndin

# Conflicts:
#	pom.xml
parents d784f61f f64cdd6e
Supports Markdown
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