commit 470f30ca8f5277748b17750c12dfa2769fc2e0f0 Merge: 35277ff6 640594f0 Author: hiro hiro@torproject.org Date: Tue Oct 20 16:52:34 2020 +0200

Merge remote-tracking branch 'gitlab/antonela-master-patch-69656' into staging

content/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)