Tainan Felipe 210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation		2018-09-17 15:20:20 -03:00
..
annotation-factory	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0	2018-09-06 22:06:40 +00:00
annotation-group	Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods	2018-07-24 17:20:37 -03:00
annotations	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0	2018-09-06 22:06:40 +00:00
whiteboard-overlay	Merge remote-tracking branch 'upstream/master' into zoom-implementation	2018-09-17 15:20:20 -03:00
whiteboard-toolbar	Merge remote-tracking branch 'upstream/master' into zoom-implementation	2018-09-17 15:20:20 -03:00
service.js	Merge pull request #5855 from musickiper/discard-cur-annotation-via-right-click	2018-09-04 11:13:00 -04:00