Ubuntu a096e25a72 Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2		2017-03-22 20:37:41 +00:00
..
.meteor	Meteor 1.4.3.1	2017-03-01 15:02:58 -08:00
client	Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2	2017-03-17 15:55:23 +00:00
imports	Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2	2017-03-22 20:37:41 +00:00
log	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
private/config	revert unwanted changes	2017-02-24 17:35:41 -03:00
public	Updated icons in the html5 client	2017-03-01 17:03:02 -08:00
server	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2017-03-06 19:21:40 +00:00
tests	Fixed all the 120+ linter warnings	2016-06-27 11:24:37 -07:00
.gitignore	Add missing configuration file	2017-02-06 19:14:48 +00:00
.jscsrc	Incorporated linting into the build process.	2016-04-06 10:06:08 -03:00
grunt-instructions.txt	Updated the instructions on running Grunt.	2016-04-06 10:08:33 -03:00
Gruntfile.js	HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js	2016-08-23 14:35:28 -07:00
package.json	Merge conflicts	2017-03-09 11:42:31 -03:00
start.sh	clean up	2016-08-24 23:13:42 +00:00