summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan 'Gared <mu.stefan@googlemail.com>2012-02-26 21:26:47 +0000
committerStefan 'Gared <mu.stefan@googlemail.com>2012-02-26 21:26:47 +0000
commit0336526a64074d6cb0e68e8c4388bc32f9154491 (patch)
tree01cacc0bf2cbff459d52e7a3d4f2614f0dc58b6b
parent6706332e4282e003c369f32c7d3191842301e4a2 (diff)
parent4fc57921f075c81498de84b3040f8b2d3dfd1a1e (diff)
downloadetherpad-lite-0336526a64074d6cb0e68e8c4388bc32f9154491.zip
Merge branch 'master' of http://github.com/Pita/etherpad-lite
-rw-r--r--static/js/pad_impexp.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/static/js/pad_impexp.js b/static/js/pad_impexp.js
index 6fe42c70..130281bf 100644
--- a/static/js/pad_impexp.js
+++ b/static/js/pad_impexp.js
@@ -257,6 +257,7 @@ var padimpexp = (function()
$("#exportworda").remove();
$("#exportpdfa").remove();
$("#exportopena").remove();
+ $(".importformdiv").remove();
$("#import").html("Import is not available. To enable import please install abiword");
}
else if(clientVars.abiwordAvailable == "withoutPDF")