Anton Georgiev a7bda6b049 Merge pull request #3815 from Klauswk/FixPollOptionsHTML5 ... Fix poll options remain visible on html5, closes #3806 HTML5		2017-04-12 16:38:49 -04:00
..
.meteor	Change how we load shared files from flash	2017-03-08 13:49:44 +00:00
client	remove unnecessarily added svgs	2017-04-12 12:49:56 -04:00
imports	Merge pull request #3815 from Klauswk/FixPollOptionsHTML5	2017-04-12 16:38:49 -04:00
log
private	fix merge conflict	2017-04-06 07:11:57 -07:00
public	remove unnecessarily added svgs	2017-04-12 12:49:56 -04:00
server	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2017-03-06 19:21:40 +00:00
tests
.gitignore	Add missing configuration file	2017-02-06 19:14:48 +00:00
.jscsrc
grunt-instructions.txt
Gruntfile.js
package.json	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into br-kick	2017-03-20 14:44:51 -04:00
start.sh