Anton Georgiev fe5ff34792 Merge branch 'html5-server-changes' of github.com:antobinary/bigbluebutton into meteor-react-alex ... Conflicts: bigbluebutton-html5/server/server.js		2016-04-25 11:57:35 +00:00
..
.meteor	Upgraded Meteor to 1.3.2.4	2016-04-21 14:30:54 -07:00
client	Ran linter and autofixed most of the warnings in the new React code	2016-04-22 16:19:17 -07:00
collections	Autofixed most of the linter warnings related to the Airbnb JavaScript Style Guide.	2016-04-06 10:08:08 -03:00
imports/ui	Ran linter and autofixed most of the warnings in the new React code	2016-04-22 16:19:17 -07:00
lib	Autofixed most of the linter warnings related to the Airbnb JavaScript Style Guide.	2016-04-06 10:08:08 -03:00
log	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
public/packages/ionicons/fonts	Combined two npm configuration files together and put it into the root directory of HTML5 client (required by Meteor to recognize the location of packages installed).	2016-04-06 10:05:52 -03:00
server	Merge branch 'html5-server-changes' of github.com:antobinary/bigbluebutton into meteor-react-alex	2016-04-25 11:57:35 +00:00
tests	Autofixed most of the linter warnings related to the Airbnb JavaScript Style Guide.	2016-04-06 10:08:08 -03:00
.gitignore	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
.jscsrc	Incorporated linting into the build process.	2016-04-06 10:06:08 -03:00
config.js	Autofixed most of the linter warnings related to the Airbnb JavaScript Style Guide.	2016-04-06 10:08:08 -03:00
grunt-instructions.txt	Updated the instructions on running Grunt.	2016-04-06 10:08:33 -03:00
Gruntfile.js	Ran linter and autofixed most of the warnings in the new React code	2016-04-22 16:19:17 -07:00
package.json	Upgraded Meteor to 1.3.2.4	2016-04-21 14:30:54 -07:00
start.sh	make start.sh executable	2016-04-21 21:54:30 +00:00