Oleksandr Zhurbenko d49efd548d Fixed shape's display ... The version went missing during the switch to 2.0		2017-07-17 16:47:18 -07:00
..
1.1	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-07-17 16:01:05 -07:00
2.0	Fixed shape's display	2017-07-17 16:47:18 -07:00
acl	Merge branch 'Acl' into Refactor2x	2017-06-19 11:28:17 -03:00
common/server	Merged info with anton's branch	2017-07-03 12:05:35 -03:00
log-client/server	Lint to eslint	2017-06-05 16:12:06 -03:00