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/a70bde5b Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a70bde5b Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a70bde5b Branch: refs/heads/master Commit: a70bde5b166f7f52d69619a9f3da47d074861d20 Parents: 06d42c9 76b5fd5 Author: Maxim Solodovnik <[email protected]> Authored: Sat Jul 8 21:55:19 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Jul 8 21:55:19 2017 +0700 ---------------------------------------------------------------------- .../apache/openmeetings/db/entity/room/Room.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
