6 Commits

Author	SHA1	Message	Date
Oleksandr Zhurbenko	251bd22738	PR review fixes	2017-09-06 12:36:52 -07:00
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
Oleksandr Zhurbenko	5aed767436	Moved SwitchSlide method to 2.0	2017-07-24 14:04:49 -07:00
Klaus	78a6fee038	Slides reflecting akkaApps	2017-07-24 14:50:44 -03:00
Klaus Klein	ca09b69555	Merge branch 'Acl' into Refactor2x ... * Acl: Add check to undefined role Lint to eslint Missing merge file Fix lint problems Change Acl lookup Change ACL to be more extensible Fix a few review comments Acl refactor working Mostly working, still problems with user subs Code refactored	2017-06-19 11:28:17 -03:00
Klaus Klein	c627deca36	Move api to api/1.1	2017-06-19 08:57:32 -03:00