Commit f4851784 authored by Sli's avatar Sli

Merge branch 'och' into 'master'

settings: Added a new subscription

See merge request !274
parents 390a4b00 797ca0f9
Pipeline #2203 passed with stage
in 31 minutes and 10 seconds