summaryrefslogtreecommitdiff
path: root/src/static/js
diff options
context:
space:
mode:
authorIván Eixarch <miao.org@gmail.com>2012-11-21 03:37:42 +0100
committerIván Eixarch <miao.org@gmail.com>2012-11-21 03:37:42 +0100
commitbeb5bf4d7d76c5825a94f276043d02ea51a19022 (patch)
treed7aad1cbe202a1615cacfb168eb4419981c8230d /src/static/js
parent0c70ada9d740b532f88c83169b7c14aeda76b65d (diff)
parenta6cbcc9d519901b0accd3d2a534c8ad16ea6046c (diff)
downloadetherpad-lite-beb5bf4d7d76c5825a94f276043d02ea51a19022.zip
Merge remote branch 'ether/develop'
Diffstat (limited to 'src/static/js')
-rw-r--r--src/static/js/l10n.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/static/js/l10n.js b/src/static/js/l10n.js
index e2584cc4..1d232908 100644
--- a/src/static/js/l10n.js
+++ b/src/static/js/l10n.js
@@ -131,7 +131,7 @@ document.webL10n = (function(window, document, undefined) {
// token expressions
var reBlank = /^\s*|\s*$/;
- var reComment = /^\s*#|^\s*$/;
+ var reComment = /^\s*;|^\s*$/;// Use ; for comments!
var reSection = /^\s*\[(.*)\]\s*$/;
var reImport = /^\s*@import\s+url\((.*)\)\s*$/i;
var reSplit = /^([^=\s]*)\s*=\s*(.+)$/; // TODO: escape EOLs with '\'