Commit d3041549 authored by Jim Lawson's avatar Jim Lawson
Browse files

Merge branch '3.1.0' into 3.1.x

# Conflicts:
#	build.sbt
parents 6a4214f3 19831084
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