Commit 45045ac6 authored by Martin Santangelo's avatar Martin Santangelo

Merge branch 'blocked-channel-in-newsfeed' into release/3.11.0

parents e7497d43 fd266247