Simon Hirtreiter 70fc71cc70 Merge remote-tracking branch 'upstream/develop' into multiple-choice-poll ... # Conflicts: # bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala		2021-02-08 17:00:36 +01:00
..
main	Merge remote-tracking branch 'upstream/develop' into multiple-choice-poll	2021-02-08 17:00:36 +01:00
test/scala/org/bigbluebutton/common2	Authenticated guests feature controlled at bbb-web properties	2021-01-23 21:48:02 -03:00