This is an automated email from the ASF dual-hosted git repository.
rpopma pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/logging-log4j-site.git
commit 8f434bfb019bd2b6d69f6ac10c2d4bc8c66c8d29
Merge: e79e10f 3453f9f
Author: Remko Popma <rem...@yahoo.com>
AuthorDate: Wed Dec 15 03:36:42 2021 +0900
Merge remote-tracking branch 'origin/asf-site' into asf-site
# Conflicts:
# log4j-2.16.0/security.html
# log4j-kotlin-1.2.0/css/maven-theme.css
# log4j-kotlin-1.2.0/images/add.gif
# log4j-kotlin-1.2.0/images/close.gif
# log4j-kotlin-1.2.0/images/external.png
# log4j-kotlin-1.2.0/images/fix.gif
# log4j-kotlin-1.2.0/images/icon_error_sml.gif
# log4j-kotlin-1.2.0/images/icon_help_sml.gif
# log4j-kotlin-1.2.0/images/icon_info_sml.gif
# log4j-kotlin-1.2.0/images/icon_success_sml.gif
# log4j-kotlin-1.2.0/images/icon_warning_sml.gif
# log4j-kotlin-1.2.0/images/ls-logo.jpg
# log4j-kotlin-1.2.0/images/maven-feather.png
# log4j-kotlin-1.2.0/images/newwindow.png
# log4j-kotlin-1.2.0/images/remove.gif
# log4j-kotlin-1.2.0/images/rss.png
# log4j-kotlin-1.2.0/images/update.gif
# log4j-kotlin-1.2.0/log4j-api-kotlin-benchmark/license.html
# log4j-kotlin-1.2.0/log4j-api-kotlin-benchmark/xref/stylesheet.css
# log4j-kotlin-1.2.0/xref/index.html
