Guilherme Leme 7650967b2f Resolved merging conflicts.		2022-02-04 08:48:58 -03:00
..
.meteor
client	Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125	2022-01-25 16:56:52 +00:00
imports	Resolved merging conflicts.	2022-02-04 08:48:58 -03:00
private	Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125	2022-01-25 16:56:52 +00:00
public	Merge pull request #14228 from gustavotrott/breakouts-message-to-all	2022-02-03 10:25:20 -05:00
server	refactor(etherpad): access control et al.	2022-01-21 16:56:01 -03:00
.dockerignore
.eslintignore
.eslintrc.js
.gitignore
deploy_to_usr_share.sh
docker-entrypoint.sh
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
test-html5.sh
TRANSIFEX_PULL_INSTRUCTIONS.md
transifex.sh