Merge branch 'master' into bootstrap-ui
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/85b62444 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/85b62444 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/85b62444 Branch: refs/heads/bootstrap-ui Commit: 85b62444d2f7a95ea48a72655ae58d9124c60da6 Parents: 9b7d562 952c438 Author: Dave Johnson <[email protected]> Authored: Sat Jun 9 16:30:52 2018 -0400 Committer: Dave Johnson <[email protected]> Committed: Sat Jun 9 16:30:52 2018 -0400 ---------------------------------------------------------------------- .../java/org/apache/roller/weblogger/ui/struts2/core/Install.java | 2 +- app/src/main/resources/struts.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/85b62444/app/src/main/resources/struts.xml ----------------------------------------------------------------------
