Commit 890526bb authored by Benoit Lavenier's avatar Benoit Lavenier

Merge branch 'master' into 'master'

Reverted Android icons and splashscreens, fix barcode scanner

See merge request !602
parents f9f39bb4 ded885df
Pipeline #7292 passed with stages
in 7 minutes and 45 seconds