Incorporate separate PR #4516 commits

Browse Source

https://github.com/ether/etherpad-lite/pull/4516 was accidentally
squash-merged when it should have been rebased and merged (or regular
merged). This merge brings in the separate commits so that the changes
can be easily reviewed in the future.

pull/4518/head

Richard Hansen 2020-11-25 13:09:58 -05:00

parent 107942ad8a e5a3062cbb

commit 1f94ac5600

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available