Oleksandr Zhurbenko 643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x		2017-08-16 19:24:59 -07:00
..
server	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-08-16 19:24:59 -07:00
index.js	Move from annotation/ to annotations/	2017-08-02 16:52:13 -03:00