Merge branch 'master' into master-redesign

Conflicts:
	public/js/ace/mode/latex.js
This commit is contained in:
James Allen 2014-07-28 10:40:35 +01:00
commit 24f140ed8b

View file

@ -180,6 +180,7 @@ var Mode = function() {
oop.inherits(Mode, TextMode);
(function() {
this.type = "text";
this.lineCommentStart = "%";
this.$id = "ace/mode/latex";