Merge branch 'master' of https://github.com/tminglei/slick-pg · tminglei/slick-pg@0a5bb15 · GitHub

Commit

Merge branch 'master' of https://github.com/tminglei/slick-pg

Browse files

Conflicts:
	README.md
	examples/play-slick-sample/README

Loading branch information

tminglei committed Feb 7, 2014

2 parents c4976f3 + aad1d1c commit 0a5bb15