Diego Mello 450a38c407 Merge 4.20.0 into single-server (#3413) ... * Merge develop into single-server * Apply changes		2021-10-01 15:12:19 -03:00
..
Server.js	Merge 4.20.0 into single-server (#3413)	2021-10-01 15:12:19 -03:00
User.js	Merge 4.18.0 into single-server (#3284)	2021-07-19 16:31:49 -03:00
migrations.js	Merge 4.20.0 into single-server (#3413)	2021-10-01 15:12:19 -03:00