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/28 03:02:14 UTC
[2/2] openmeetings git commit: Merge branch '4.0.x' into
wicket-defer-all
Merge branch '4.0.x' into wicket-defer-all
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/df99fa20
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/df99fa20
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/df99fa20
Branch: refs/heads/wicket-defer-all
Commit: df99fa207bf45359700d52fa7ce13d2197a10045
Parents: e379eb9 e5bf058
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Jan 28 10:02:01 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Jan 28 10:02:01 2018 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/web/user/chat/ChatToolbar.html | 6 +++---
.../org/apache/openmeetings/web/user/chat/ChatToolbar.java | 4 +++-
.../java/org/apache/openmeetings/web/user/chat/chat-base.js | 9 ++++++++-
3 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------