This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller.git
commit b5a12c1bb9a32a34ba0e5901b604f9f5d6afc03b Merge: af67f5c 4c300e9 Author: Dave Johnson <[email protected]> AuthorDate: Sun Dec 16 10:43:52 2018 -0500 Merge branch 'roller-5.2.x' # Conflicts: # app/pom.xml # assembly-release/pom.xml # assembly-release/sign-release.sh # it-selenium/pom.xml # it-selenium/src/test/resources/roller-jettyrun.properties # pom.xml .../roller/weblogger/business/WebloggerImpl.java | 55 +++++++++++++++------- .../weblogger/ui/struts2/admin/GlobalConfig.java | 13 ++--- app/src/main/webapp/WEB-INF/velocity/feeds.vm | 5 ++ .../velocity/templates/feeds/site-comments-atom.vm | 1 + .../velocity/templates/feeds/site-comments-rss.vm | 1 + .../velocity/templates/feeds/site-entries-atom.vm | 1 + .../velocity/templates/feeds/site-entries-rss.vm | 1 + .../velocity/templates/feeds/site-search-atom.vm | 1 + .../templates/feeds/weblog-comments-atom.vm | 1 + .../templates/feeds/weblog-comments-rss.vm | 1 + .../templates/feeds/weblog-entries-atom.vm | 1 + .../velocity/templates/feeds/weblog-entries-rss.vm | 1 + .../velocity/templates/feeds/weblog-files-atom.vm | 1 + .../velocity/templates/feeds/weblog-search-atom.vm | 1 + 14 files changed, 62 insertions(+), 22 deletions(-)
