James Allen c56648ab80 Merge branch 'master' into master-redesign ...

Conflicts:
	app/views/project/list.jade
	public/coffee/list.coffee
	public/stylesheets/less/list.less
	public/stylesheets/less/style.less

2014-06-17 11:54:29 +01:00

..

smoke/coffee

log out after smoke tests

2014-05-19 11:53:10 +01:00

UnitTests/coffee

Merge branch 'master' into master-redesign

2014-06-17 11:54:29 +01:00