Oleksandr Zhurbenko e39963d4de Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react ... Conflicts: bigbluebutton-html5/package.json		2016-06-02 15:20:41 -07:00
..
chat	Merge pull request #3161 from antobinary/captions	2016-06-02 17:02:03 -04:00
common/server	move helpers; extract nodejsApp	2016-06-01 17:18:13 +00:00
cursor	Fixes some imports	2016-05-19 16:14:12 +00:00
deskshare	move helpers; extract nodejsApp	2016-06-01 17:18:13 +00:00
FontControl	Changing structure to /api/list/index.js	2016-05-12 14:04:00 -05:00
meetings	Fixes some imports	2016-05-19 16:14:12 +00:00
phone	Move session/auth logic to separated services	2016-06-02 10:46:35 -03:00
polls	move helpers; extract nodejsApp	2016-06-01 17:18:13 +00:00
presentations	move helpers; extract nodejsApp	2016-06-01 17:18:13 +00:00
shapes	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react	2016-06-02 15:20:41 -07:00
slides	Ported changes in addShapeToCollection func and the structure of the text shape obj to the new server side structure	2016-05-26 09:37:54 -07:00
users	Merge pull request #3161 from antobinary/captions	2016-06-02 17:02:03 -04:00
verto	Move session/auth logic to separated services	2016-06-02 10:46:35 -03:00