Merge branch 'master' into mysql_support
# Conflicts:
#	build.sbt
commit 0a03e41f1c68109539782854fb8e935f0dc65144
2 parents 74f3f6b + a79f105
@Naoki Takezoe Naoki Takezoe authored on 30 Apr 2016
Showing 2 changed files
View
README.md
View
build.sbt