Gustavo Trott 8555187df3 Resolve conflicts with Develop branch		2021-11-11 14:02:03 -03:00
..
.meteor	chore: Update Meteor 2.3.6->2.5	2021-10-29 21:11:13 +00:00
client	Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev	2021-10-29 13:24:51 +00:00
imports	Resolve conflicts with Develop branch	2021-11-11 14:02:03 -03:00
private	Merge branch 'develop' into allow-chrome-in-ios	2021-10-28 13:38:18 -03:00
public	Resolve conflicts with Develop branch	2021-11-11 14:02:03 -03:00
server	Auto assign breakout names and users using lastBreakout or groups	2021-11-11 10:10:31 -03:00
.dockerignore
.eslintignore
.eslintrc.js	Merged upstream develop branch	2021-05-01 16:59:20 +02:00
.gitignore	Add missing changes after moving test files to new folder	2021-08-01 18:24:17 -03:00
deploy_to_usr_share.sh	build: bbb-html5 npm deps improvements	2021-10-29 19:34:47 +00:00
docker-entrypoint.sh	Merged upstream develop branch	2021-05-01 16:59:20 +02:00
Dockerfile
Dockerfile.dev
package-lock.json	chore: Updated package-lock.json trim-newlines	2021-10-29 13:25:26 +00:00
package.json	Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev	2021-10-29 13:24:51 +00:00
test-html5.sh
TRANSIFEX_PULL_INSTRUCTIONS.md
transifex.sh	chore: adjust transifex.sh for 2.4 locales	2021-07-30 23:46:58 +00:00