Revert "Merge branch 'develop' of github.com:ether/etherpad-lite into develop"

This reverts commit 6fad0210f8, reversing
changes made to 128f3e15eb.
This commit is contained in:
John McLear 2020-06-07 18:46:41 +00:00
parent 564e8fee07
commit 512a51149d
4 changed files with 608 additions and 615 deletions

View file

@ -23,6 +23,8 @@ var ERR = require("async-stacktrace");
var settings = require('./Settings');
var async = require('async');
var fs = require('fs');
var StringDecoder = require('string_decoder').StringDecoder;
var CleanCSS = require('clean-css');
var path = require('path');
var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
var RequireKernel = require('etherpad-require-kernel');