This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 69b94c09fd47b5b1d340a76fb331092e529b271c Merge: 91994c3 85d587d Author: Maxim Solodovnik <[email protected]> AuthorDate: Thu Dec 3 23:34:11 2020 +0700 Merge branch 'OPENMEETINGS-2000-local-settings-dlg' .../apache/openmeetings/web/common/MainPanel.java | 2 +- .../openmeetings/web/common/menu/OmMenuItem.java | 14 +++++++-- .../apache/openmeetings/web/room/RoomPanel.html | 20 ++++++++++++ .../openmeetings/web/room/menu/ActionsSubMenu.java | 36 ++++++++++++++++------ .../openmeetings/web/room/menu/PollsSubMenu.java | 8 ++--- .../openmeetings/web/room/menu/RoomMenuPanel.java | 16 +--------- 6 files changed, 65 insertions(+), 31 deletions(-)
