fac4e6a4132c782386f4f342958d314f3bb34435 - plugins/emoticons

commit: fac4e6a4132c782386f4f342958d314f3bb34435
[log]
author: Marco Miller <marco.miller@ericsson.com>
Wed Mar 20 16:35:30 2019 -0400
committer: Marco Miller <marco.miller@ericsson.com>
Wed Mar 20 16:37:36 2019 -0400
tree: a25dc704019d5df02056de897f3c3df349ccea59
parent: 2b9378ae15eff47f9a816c18391d283471462618 [diff]
parent: 5f432c3278bfe70300ac342edb43c07272d9bc52 [diff]

Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Ic8a1f8822ddc026447455f1d717d983bfb2c3ec8

tree: a25dc704019d5df02056de897f3c3df349ccea59