Merge branch '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/58e5c009 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/58e5c009 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/58e5c009 Branch: refs/heads/OPENMEETINGS-1791-quick-poll Commit: 58e5c00987a719c4520d4c05ab6a810e4a5bf118 Parents: 611e0ef d0512ba Author: Maxim Solodovnik <[email protected]> Authored: Thu Jan 11 22:15:56 2018 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Jan 11 22:15:56 2018 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/openmeetings/backup/BackupImport.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
