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
..
coffee	Inform other clients when we accept a change	2017-01-09 15:54:12 +01:00
templates/project_files
views	Decouple ranges update from the overview panel; integrate it with the dropdown.	2017-01-09 14:59:01 +00:00