fix conflict master
Passed
Kevin Albert Simanjuntak
created pipeline for commit
797affe0
, finished
1 related merge request: !93 Kevin hotfix
5 minutes 2 seconds, queued for 1 seconds