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/7636650c Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/7636650c Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/7636650c Branch: refs/heads/OPENMEETINGS-1791-quick-poll Commit: 7636650cd089f556a96aee7783707629fd0fde20 Parents: 2ab24ff f95b632 Author: Maxim Solodovnik <[email protected]> Authored: Thu Jan 11 19:44:55 2018 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Jan 11 19:44:55 2018 +0700 ---------------------------------------------------------------------- openmeetings-server/src/site/xdoc/security.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) ----------------------------------------------------------------------
