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:45 UTC
[4/7] openmeetings git commit: Merge remote-tracking branch
'origin/4.0.x' into OPENMEETINGS-1791-quick-poll
Merge remote-tracking branch 'origin/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/80e86e2c
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/80e86e2c
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/80e86e2c
Branch: refs/heads/OPENMEETINGS-1791-quick-poll
Commit: 80e86e2c0af1ea1cd82e8bb6b9792d883bdd592f
Parents: 7636650 9922eec
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Jan 11 20:33:52 2018 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Jan 11 20:33:52 2018 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/openmeetings/web/admin/admin.js | 2 +-
.../main/java/org/apache/openmeetings/web/room/room-base.js | 8 +++++---
.../openmeetings/web/user/calendar/calendar-functions.js | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------