James Allen 6a4bf3885d Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel ...

Conflicts:
	public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee

2016-11-16 16:05:05 +00:00

..

web

Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel

2016-11-16 16:05:05 +00:00