mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-02-01 03:12:42 +01:00
Merge pull request #1366 from ether/master
Bring develop up to date with master
This commit is contained in:
commit
88e42dd109