Commit 15676654 authored by Toby Hodges's avatar Toby Hodges

Merge branch '61-activity-logic' into 'master'

61 activity logic

See merge request !3
parents 8a62796e b8e87d0f
Pipeline #10685 passed with stage
in 1 minute and 19 seconds