Do post-send tasks when resolving conflicts
Do post-send tasks when resolving conflicts

Fixes #684

// FREEBIE

nrizzio/Signal-Desktop,nrizzio/Signal-Desktop,nrizzio/Signal-Desktop,nrizzio/Signal-Desktop