You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/01/14 13:22:48 UTC
[7/7] openmeetings git commit: Merge branch '4.0.x' into
OPENMEETINGS-1791-quick-poll
Merge branch '4.0.x' into OPENMEETINGS-1791-quick-poll
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/3e0687a8
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/3e0687a8
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/3e0687a8
Branch: refs/heads/OPENMEETINGS-1791-quick-poll
Commit: 3e0687a85906aa4c8286795f2fff91836b3a8ea5
Parents: 58e5c00 06a85fe
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Jan 14 17:25:31 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Jan 14 17:25:31 2018 +0700
----------------------------------------------------------------------
.../openmeetings/backup/BackupImport.java | 1 +
.../backup/converter/WbConverter.java | 29 ++++++++++++++------
.../web/admin/users/PasswordDialog.java | 19 +++++++++++--
.../openmeetings/web/admin/users/UserForm.java | 15 ++++++++--
4 files changed, 51 insertions(+), 13 deletions(-)
----------------------------------------------------------------------