You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@roller.apache.org by sn...@apache.org on 2018/10/21 21:14:17 UTC

[3/3] roller git commit: Merge branch 'roller-5.2.0'

Merge branch 'roller-5.2.0'

# Conflicts:
#	assembly-release/sign-release.sh


Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/bcea95ea
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/bcea95ea
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/bcea95ea

Branch: refs/heads/master
Commit: bcea95ea4b3aa803e1bbb076e0e3eb6c43c060e1
Parents: fb34b0a 0a8b286
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Oct 21 17:14:13 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Oct 21 17:14:13 2018 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------