Skip to content
GitLab
Commit 9fd9433e authored by Jim Lawson's avatar Jim Lawson
Browse files

Merge branch '3.0.x' into 3.1.x 

# Conflicts:
#	build.sbt
#	project/build.properties
parents 652fc4c7 20f204c7
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