tree 3dada6b4702c32c2045ef764e1572f7575a13d39
parent af67f5c59ae7129c68015c56c0f928a39b943e1f
parent 4c300e921ca2158570665595f83c53e2b89ad1e9
author Dave Johnson <snoopdave@gmail.com> 1544975032 -0500
committer Dave Johnson <snoopdave@gmail.com> 1544975032 -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