overleaf/services/web/app/coffee
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
..
Features Merge branch 'master' into master-redesign 2014-06-17 11:54:29 +01:00
infrastructure
managers
models Merge branch 'master' into master-redesign 2014-06-17 11:54:29 +01:00
errors.coffee
router.coffee Merge branch 'master' into master-redesign 2014-06-17 11:54:29 +01:00