Anton Georgiev 98e8a96f83 Merge pull request #14434 from prlanzarin/u25-pierre-d1 ... refactor(audio): remove duplicated loadBridges method definition		2022-02-22 15:03:46 -05:00
..
.meteor	remove node-sass and css-modules dependencies	2021-11-11 13:20:50 +00:00
client	Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125	2022-01-25 16:56:52 +00:00
imports	Merge pull request #14434 from prlanzarin/u25-pierre-d1	2022-02-22 15:03:46 -05:00
private	chore: Enable displayBbbServerVersion in settings.yml	2022-02-17 17:21:54 +00:00
public	Merge pull request #14281 from gustavo-em/version_in_client	2022-02-17 08:47:14 -05:00
server	Merge remote-tracking branch 'upstream/v2.4.x-release' into 2524-feb08	2022-02-09 15:52:42 +00: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	Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125	2022-01-25 16:56:52 +00:00
package.json	Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125	2022-01-25 16:56:52 +00:00
redo.sh	TEMP	2021-12-09 20:37:05 +00:00
test-html5.sh
TRANSIFEX_PULL_INSTRUCTIONS.md	move transifex instructions to the repo from docs	2019-07-30 10:27:30 -07:00
transifex.sh	chore: adjust transifex.sh for 2.4 locales	2021-07-30 23:46:58 +00:00