perroned 8c7fdc0036 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton ... Conflicts: bigbluebutton-client/resources/prod/lib/verto_extension.js		2016-07-27 19:32:01 +00:00
..
chat	Fix merge conflicts	2016-07-05 16:50:14 +00:00
common/server	Merge after git conflict/lost object	2016-07-11 12:34:58 +00:00
cursor	Fixed all the 120+ linter warnings	2016-06-27 11:24:37 -07: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	Changed 'let' to 'const' where it was possible and adjusted imports	2016-06-27 14:48:46 -07:00
phone	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-07-22 19:20:00 +00:00
polls	Fixed a bug with Polls deletion from all meetings	2016-06-27 11:30:37 -07:00
presentations	Changed 'let' to 'const' where it was possible and adjusted imports	2016-06-27 14:48:46 -07:00
shapes	Changed 'let' to 'const' where it was possible and adjusted imports	2016-06-27 14:48:46 -07:00
slides	add httpS flag in config instead of detecting prod vs dev env	2016-07-27 16:36:33 +00:00
users	fix issue with slide calc under https	2016-07-26 17:33:35 +00:00
verto	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-07-22 19:20:00 +00:00