James Allen 35bdb4383a Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes ...

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

2017-01-09 16:11:59 +01:00

..

web

Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes

2017-01-09 16:11:59 +01:00