Console Output

[appng-manager] Running shell script
+ git merge --ff appng-manager-1.13.x --strategy-option theirs
Merge made by the 'recursive' strategy.
 application-home/conf/config.xml                   |  1 +
 .../conf/datasources/ds-platformEvents.xml         |  1 +
 application-home/conf/pages/pg-platform.xml        |  1 +
 changelog.txt                                      | 48 ++++++++++++++++++++++
 pom.xml                                            |  2 +-
 src/main/asciidoc/appng.css                        |  4 +-
 src/main/asciidoc/parts/platform.adoc              | 35 ++++++++++++++++
 .../manager/business/PlatformEvents.java           |  9 +++-
 .../manager/service/PlatformEventService.java      |  1 +
 .../xml/PlatformEventsTest-testShowAll.xml         |  4 ++
 10 files changed, 102 insertions(+), 4 deletions(-)
 create mode 100644 changelog.txt