Merge remote-tracking branch 'upstream/release-v1.33.0'

This commit is contained in:
Tulir Asokan 2021-04-28 14:15:25 +03:00
commit c9cee6c534
685 changed files with 4011 additions and 2719 deletions

View file

@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2014-2016 OpenMarket Ltd
# Copyright 2017-2018 New Vector Ltd
# Copyright 2019 The Matrix.org Foundation C.I.C.