Merge branch 'master' into bootstrap-ui # 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
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/9b7d562e Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/9b7d562e Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/9b7d562e Branch: refs/heads/bootstrap-ui Commit: 9b7d562ec9ae4ae1cf43080a6dbc01cc68e38411 Parents: f8ee9d7 870e933 Author: Dave Johnson <[email protected]> Authored: Mon May 28 17:48:04 2018 -0400 Committer: Dave Johnson <[email protected]> Committed: Mon May 28 17:48:04 2018 -0400 ---------------------------------------------------------------------- .../ui/rendering/WeblogRequestMapper.java | 20 ++++++++++++++------ docs/README.md | 10 ++++++++++ docs/README.txt | 9 --------- 3 files changed, 24 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
