James Allen 091eb7e462 Merge branch 'master' into ja-review-panel ...

Conflicts:
	public/coffee/ide.coffee
	public/stylesheets/app/editor.less

2016-11-03 10:07:37 +00:00

..

coffee

Merge branch 'sk-passport-ldap'

2016-11-02 15:39:32 +00:00

templates/project_files

…

views

Merge branch 'master' into ja-review-panel

2016-11-03 10:07:37 +00:00