Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/openmeetings
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c6e0db16 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c6e0db16 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c6e0db16 Branch: refs/heads/master Commit: c6e0db165897ee4bc360d241215020d688e2ba46 Parents: bbcdbf7 7e29189 Author: Maxim Solodovnik <[email protected]> Authored: Mon Jul 31 20:31:15 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Jul 31 20:31:15 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/core/converter/FlvExplorerConverter.java | 8 ++++---- openmeetings-server/pom.xml | 2 +- openmeetings-server/src/site/xdoc/Clustering.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c6e0db16/openmeetings-server/src/site/xdoc/Clustering.xml ----------------------------------------------------------------------
