Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
yflory 2020-03-26 13:12:52 +01:00
commit 7b15775d75

View File

@ -507,8 +507,6 @@ define([
framework.start();
};
Messages.canvas_brush = "Brush"; // XXX
Messages.canvas_select = "Select"; // XXX
var initialContent = function () {
return [