update changelog
update changelog
Merge branch 'develop' of github.com:ether/etherpad-lite into develop