5f432c3278bfe70300ac342edb43c07272d9bc52 - plugins/emoticons

commit: 5f432c3278bfe70300ac342edb43c07272d9bc52
[log]
author: Marco Miller <marco.miller@ericsson.com>
Wed Mar 20 12:10:28 2019 -0400
committer: Marco Miller <marco.miller@ericsson.com>
Wed Mar 20 12:15:45 2019 -0400
tree: a25dc704019d5df02056de897f3c3df349ccea59
parent: 252e1a027975f9d7732eedd78f11d91c5558a9be [diff]
parent: cce0ccb31ccd49dd2c7c36bdc3a85fb744ce7b68 [diff]

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I006658576bafa384d88538a16ca5ab0151beff80

tree: a25dc704019d5df02056de897f3c3df349ccea59

.settings/
src/
tools/
.bazelignore
.bazelrc
.gitignore
bazlets.bzl
BUILD
LICENSE
WORKSPACE