Merge remote-tracking branch 'origin/master' into master

zengh

2020-11-13 8274f20d8093486dc3d54e074d25b6e412f4e4c7

1
2
//>>built
define({loadingState:"S'est\u00e0 carregant...",errorState:"Ens sap greu. S'ha produ\u00eft un error."});