You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openmeetings.apache.org by se...@apache.org on 2021/09/03 05:28:19 UTC

[openmeetings] 02/02: Merge branch 'master' into feature/OPENMEETINGS-2420-update-swagger-rest-api-docs-RoomService

This is an automated email from the ASF dual-hosted git repository.

sebawagner pushed a commit to branch feature/OPENMEETINGS-2420-update-swagger-rest-api-docs-RoomService
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit dcb1235895a71985f8f541a790011d096231d45e
Merge: 7db3f9a 2f802e9
Author: Sebastian Wagner <se...@gmail.com>
AuthorDate: Fri Sep 3 17:27:51 2021 +1200

    Merge branch 'master' into feature/OPENMEETINGS-2420-update-swagger-rest-api-docs-RoomService

 .../test/java/org/apache/openmeetings/web/TestCalendar.java    |  2 +-
 .../org/apache/openmeetings/webservice/NetTestWebService.java  |  2 +-
 pom.xml                                                        | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)