Commit 52eb06ec authored by Nestor Diaz's avatar Nestor Diaz

Merge branch 'beta'

# Conflicts:
#	package-lock.json
#	package.json
parents 18fc74e3 051c798d
Pipeline #110877 passed with stages
in 33 minutes and 18 seconds