This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch design-pages-custom-theme-setting
in repository https://gitbox.apache.org/repos/asf/roller.git
from 9aa405347 Make the Design pages follow the custom-theme setting
add 83ea19537 Encode meta descriptions once, whatever the trust setting
(#273)
add 9ed5cf9e4 Merge remote-tracking branch 'origin/roller-6.1.x' into
design-pages-custom-theme-setting
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 7 ++
app/src/main/webapp/WEB-INF/velocity/weblog.vm | 5 +-
app/src/main/webapp/themes/gaurav/std_head.vm | 4 +-
.../velocity/MetaDescriptionEscapingTest.java | 137 +++++++++++++++++++++
4 files changed, 149 insertions(+), 4 deletions(-)
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/rendering/velocity/MetaDescriptionEscapingTest.java