This is an automated email from the ASF dual-hosted git repository.
mraible pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
from 0d7ce8d0c Merge pull request #288 from mraible/release-skill-atr-notes
add aac111f50 Keep the Emoticons plugin out of HTML tags and comments
new 99f80cc84 Merge pull request #290 from mraible/smileys-outside-tags
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.md | 3 +++
.../business/plugins/entry/SmileysPlugin.java | 19 ++++++++++++++-----
.../business/plugins/entry/SmileysPluginTest.java | 18 ++++++++++++++++++
3 files changed, 35 insertions(+), 5 deletions(-)