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 2017/09/18 05:25:52 UTC

[13/18] openmeetings git commit: Merge branch '3.3.x' into OPENMEETINGS-1671-room-files

Merge branch '3.3.x' into OPENMEETINGS-1671-room-files


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6a8fef06
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6a8fef06
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6a8fef06

Branch: refs/heads/3.3.x
Commit: 6a8fef0646a4047cdb3961a111cf399197d3e26e
Parents: db36ff2 0d43610
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Sep 14 21:16:07 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Sep 14 21:16:07 2017 +0700

----------------------------------------------------------------------
 CHANGELOG                                       | 15 ++++++++
 README                                          | 14 ++++++++
 .../src/site/xdoc/NewsArchive.xml               | 24 +++++++++++++
 openmeetings-server/src/site/xdoc/downloads.xml | 36 ++++++++++----------
 openmeetings-server/src/site/xdoc/index.xml     | 21 ++++++------
 pom.xml                                         |  4 +--
 6 files changed, 83 insertions(+), 31 deletions(-)
----------------------------------------------------------------------