pull dari master, fix conflicts
Passed
HANIF AGUNG PRAYOGA
created pipeline for commit
b1a52dd1
, finished
2 related merge requests: !124 1606884344 58, !80 1606884344 58
4 minutes 2 seconds, queued for 1 seconds