This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch java11-modules in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 0bd41ba2c052f46d2fcf01a528db3a31e5f7b388 Merge: 49cf5a3 5b4cd55 Author: Maxim Solodovnik <[email protected]> AuthorDate: Thu Jul 22 22:33:11 2021 +0700 Merge branch 'master' into java11-modules CHANGELOG.md | 41 ++++++++++++ README.md | 19 ++++++ openmeetings-core/pom.xml | 2 +- openmeetings-db/pom.xml | 2 +- openmeetings-install/pom.xml | 2 +- openmeetings-screenshare/pom.xml | 2 +- openmeetings-server/pom.xml | 4 +- openmeetings-server/src/site/xdoc/NewsArchive.xml | 72 ++++++++++++++++++++++ .../src/site/xdoc/commercial-support.xml | 8 ++- openmeetings-server/src/site/xdoc/downloads.xml | 30 ++++----- openmeetings-server/src/site/xdoc/index.xml | 32 ++++------ openmeetings-server/src/site/xdoc/installation.xml | 2 +- openmeetings-service/pom.xml | 2 +- openmeetings-util/pom.xml | 2 +- openmeetings-web/pom.xml | 2 +- .../web/app/Application_es.properties.xml | 6 +- .../web/app/Application_pt_BR.properties.xml | 22 +++---- .../openmeetings/web/room/EventDetailDialog.html | 2 +- openmeetings-webservice/pom.xml | 2 +- pom.xml | 38 +++++++----- 20 files changed, 213 insertions(+), 79 deletions(-)
