Commit 48ae1f7c authored by Sli's avatar Sli

Merge branch 'och' into 'master'

Edited subscriptions

See merge request !275
parents f34f5fe6 aaf1adaa
Pipeline #2229 passed with stage
in 30 minutes and 10 seconds