Commit a181fa29 authored by harukin's avatar harukin

Merge branch 'origin' into 'master'

Update 4.2

See merge request !56
parents 3f208d80 9f403a4d
Pipeline #251 failed with stage
in 0 seconds