Anton Georgiev 7d75843140 Fix a forgotten line left while resolving conflict		2020-07-14 11:19:11 -04:00
..
.meteor
client	Move Intl component outside of Base component	2020-05-12 10:31:00 -03:00
imports	Fix a forgotten line left while resolving conflict	2020-07-14 11:19:11 -04:00
private	Enable multiple webcams and network stats by default	2020-07-07 18:43:46 +00:00
public	Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop	2020-05-25 17:32:24 +00:00
server	Merge branch 'develop' into 2.3-audio-stats	2020-05-26 12:36:15 -04:00
tests	fixes webcam and audio automated tests	2020-06-24 16:51:20 -03:00
.dockerignore
.eslintignore
.eslintrc.js
.gitignore
docker-entrypoint.sh
Dockerfile
Dockerfile.dev
package-lock.json	Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2	2020-06-16 16:40:56 -03:00
package.json	Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2	2020-06-16 16:40:56 -03:00
test-html5.sh
TRANSIFEX_PULL_INSTRUCTIONS.md
transifex.sh