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
Languages
JavaScript 61.6%
TypeScript 31.8%
SCSS 2.5%
Java 2%
Pug 0.7%
Other 1.2%