Ghazi Triki ff80b30df1 Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master ... # Conflicts: # bigbluebutton-html5/imports/ui/services/audio-manager/index.js		2018-11-02 21:02:02 +01:00
..
compatibility	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master	2018-11-01 14:00:54 +01:00
stylesheets	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0	2018-09-06 22:06:40 +00:00
main.html	Add Double tap zoom and pan navigation	2018-09-12 11:36:04 -03:00
main.jsx	migrate to session	2018-10-26 12:16:29 -03:00