Brian Gough 49a7c3c27b Merge branch 'per-user-containers-part-2' ...

Conflicts:
	app/coffee/Features/Compile/ClsiManager.coffee
	app/coffee/Features/Compile/CompileController.coffee
	app/coffee/Features/Compile/CompileManager.coffee

2016-06-13 12:24:48 +01:00

..

web

Merge branch 'per-user-containers-part-2'

2016-06-13 12:24:48 +01:00