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
..
binary-file.jade
chat.jade
editor.jade
file-tree.jade
header.jade
history.jade
hotkeys.jade
left-menu.jade
pdf.jade
publish-template.jade
share.jade