Dale Wijnand 76e2f550ec Merge branch '1.1.x' into merge-1.1.x-into-1.x ...

* 1.1.x:
  Update mimaPreviousArtifacts/sbt.version
  Introduce SBT_GLOBAL_SERVER_DIR env var to override too long paths
  Handle very long socket file paths on UNIX

Conflicts:
	project/build.properties

2018-02-14 14:38:07 +00:00

..

src/main

Merge branch '1.1.x' into merge-1.1.x-into-1.x

2018-02-14 14:38:07 +00:00