tree c6374e335a436c1d22604bff5836fe029d4e4eb8
parent 88f02b99f0a286e37115fd7a7a18d7d7d5d07224
parent f0433b70fb6ab0277515459da86949009d9d169c
author snoopdave@gmail.com <snoopdave@gmail.com> 1560109625 -0400
committer snoopdave@gmail.com <snoopdave@gmail.com> 1560109625 -0400

Merge branch 'roller-5.2.x'

# Conflicts:
#	app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
#	app/src/test/resources/jetty.xml
#	assembly-release/sign-release.sh