Skip to content
GitLab
Commit 145c54ca authored by chick's avatar chick
Browse files

Merge branch '1.2.x' into 1.2-release 

# Conflicts:
#	build.sbt
parents b2997af0 65330bd0
Hide whitespace changes
Inline Side-by-side
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