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

pull/1/head
yflory 5 years ago
commit 7b15775d75

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

Loading…
Cancel
Save