Ubuntu 5e0a5f019c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2		2017-03-24 19:14:21 +00:00
..
.meteor	Change how we load shared files from flash	2017-03-08 13:49:44 +00:00
client	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2	2017-03-24 19:14:21 +00:00
imports	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2	2017-03-24 19:14:21 +00:00
log
private	Merge conflicts	2017-03-22 10:00:37 -03:00
public	Updated icon sets to the latest	2017-03-23 09:15:33 -07: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