1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-21 00:22:36 -05:00
Commit graph

3 commits

Author SHA1 Message Date
James Allen
52f3fe7303 Show different users changes in different colours 2016-10-20 12:15:22 +01:00
James Allen
9682af3981 Merge branch 'master' into ja-track-changes
Conflicts:
	public/coffee/ide/history/HistoryManager.coffee
2016-10-10 17:10:10 +01:00
James Allen
1c9abd35f8 Rename track-changes -> history on the client
Conflicts:
	app/views/project/editor/history.jade
2016-10-10 16:59:25 +01:00