James Allen 812ee82af1 Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel ... Conflicts: app/views/project/editor/editor.jade		2016-11-10 10:52:40 +00:00
..
coffee	Merge branch 'sk-passport-ldap'	2016-11-02 15:39:32 +00:00
templates/project_files
views	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-10 10:52:40 +00:00