Henry Oswald 8d57e052c7 Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign
Conflicts:
	public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
	public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee
2014-07-10 15:14:06 +01:00
2014-07-10 14:39:37 +01:00
Languages
JavaScript 61.6%
TypeScript 31.8%
SCSS 2.5%
Java 2%
Pug 0.7%
Other 1.2%