Henry Oswald 0a7bc1c5f1 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
Conflicts:
	app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee
2014-10-20 14:25:26 +01:00
2014-10-20 14:24:39 +01:00
Languages
JavaScript 61.6%
TypeScript 31.8%
SCSS 2.5%
Java 2%
Pug 0.7%
Other 1.2%