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
..
brand
coffee	Merge branch 'master' into ja-track-changes	2016-10-10 17:10:10 +01:00
font
img
js
recurly
stylesheets	Add basic change tracking into editor behind a feature flag	2016-10-10 17:06:46 +01:00
favicon.ico
humans.txt
robots.txt
sharelatex-security.pub