Merge branch '223-bugs-causados-por-merges' into 'development'

Resolve "Bugs causados por merges"

Closes #223

See merge request !123
1 job for 227-atualizar-instrucoes-de-upload-de-relatorio in 3 minutes and 11 seconds (queued for 1 second)