overleaf/services/web/test
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
UnitTests/coffee Merge branch 'master' into master-redesign 2014-06-17 11:54:29 +01:00