roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [8/8] roller git commit: Merge branch 'master' into bootstrap-ui
Date Mon, 03 Sep 2018 12:16:18 GMT
Merge branch 'master' into bootstrap-ui

# Conflicts:
#	app/pom.xml
#	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/7df1f1d0
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/7df1f1d0
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/7df1f1d0

Branch: refs/heads/bootstrap-ui
Commit: 7df1f1d0de466a57fb328c6764af6fe41bdd5f69
Parents: 48e9708 ad62b85
Author: Dave Johnson <snoopdave@gmail.com>
Authored: Mon Sep 3 08:16:08 2018 -0400
Committer: Dave Johnson <snoopdave@gmail.com>
Committed: Mon Sep 3 08:16:08 2018 -0400

----------------------------------------------------------------------
 app/pom.xml                                                  | 8 +-------
 .../planet/business/SingleThreadedFeedUpdaterTest.java       | 2 +-
 app/src/test/resources/jetty.xml                             | 2 +-
 pom.xml                                                      | 6 +++---
 4 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/roller/blob/7df1f1d0/app/pom.xml
----------------------------------------------------------------------


Mime
View raw message