tree d36d74dfd14ad7a550cb2f9d1ad3f26c16d12f57
parent e0ecfcd1f7b9b09c4021b5fe11e73476e3a18431
parent 9f3f069321def036b93f6ab2b78d94ee088043c9
author Jenkins <jenkins@review.openstack.org> 1429195376 +0000
committer Gerrit Code Review <review@openstack.org> 1429195376 +0000

Merge "Enable websockets transport on Etherpad"