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/8bfe1c09 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8bfe1c09 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8bfe1c09 Branch: refs/heads/3.3.x Commit: 8bfe1c09ee003f8f57fa6f947fc28afe1be87c6b Parents: c17eb7c ccfeabb Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Thu Sep 14 14:06:26 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Thu Sep 14 14:06:26 2017 +0700 ---------------------------------------------------------------------- openmeetings-server/src/site/site.xml | 1 + .../src/site/xdoc/ExternalVideo.xml | 33 ++++++++++++++++++++ 2 files changed, 34 insertions(+) ----------------------------------------------------------------------