Commit f9e34348 authored by Evan Hunt's avatar Evan Hunt

Merge branch 'branchsync' into 'master'

update branchsync to deal with merge commits

See merge request !127
parents 3baf604b fccf8ca2
Pipeline #747 passed with stages
in 10 minutes and 16 seconds