Brian Gough 751166d987 Merge branch 'master' into fix-pdfng-progress-bar
Conflicts:
	public/coffee/ide/pdfng/directives/pdfRenderer.coffee
	public/coffee/ide/pdfng/directives/pdfViewer.coffee
2015-01-16 14:19:59 +00:00
Languages
JavaScript 61.6%
TypeScript 31.8%
SCSS 2.5%
Java 2%
Pug 0.7%
Other 1.2%