mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-22 15:26:14 +01:00
15a7d24450
Conflicts: src/node/handler/PadMessageHandler.js src/static/css/pad.css src/templates/pad.html |
||
---|---|---|
.. | ||
admin.css | ||
iframe_editor.css | ||
pad.css | ||
timeslider.css |