perroned 2a23778ea9 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton ... Conflicts: bigbluebutton-client/resources/config.xml.template bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as bigbluebutton-html5/imports/api/verto/index.js bigbluebutton-html5/imports/ui/components/deskshare/service.js		2016-07-22 19:20:00 +00:00
..
.meteor	Remove Meteor dev_bundle	2016-07-11 20:20:07 +00:00
client	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-07-22 19:20:00 +00:00
imports	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-07-22 19:20:00 +00:00
lib	Added scaling on window resize for the slide	2016-06-01 16:37:51 -07:00
log	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
public/fonts	Add basic styles for new design	2016-05-02 19:42:54 -03:00
server	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react	2016-06-02 15:20:41 -07:00
tests	Fixed all the 120+ linter warnings	2016-06-27 11:24:37 -07:00
.gitignore	Add .meteor/dev_bundle to gitignore	2016-07-12 14:03:13 +00:00
.jscsrc	Incorporated linting into the build process.	2016-04-06 10:06:08 -03:00
config.js	Fixed all the 120+ linter warnings	2016-06-27 11:24:37 -07:00
grunt-instructions.txt	Updated the instructions on running Grunt.	2016-04-06 10:08:33 -03:00
Gruntfile.js	Linting, changed line endings from Windows to Unix	2016-05-30 15:07:02 -07:00
package.json	Merge after git conflict/lost object	2016-07-11 12:34:58 +00:00
settings-development.json	Fix nav-bar userlist toggle icon	2016-05-20 13:39:58 -03:00
settings-production.json	Split the Meteor command into options stored as Meteor settings.	2016-04-28 18:27:43 -04:00
start.sh	Revert changes to start.sh and remove useless file added on my last commit	2016-05-31 17:39:11 -03:00