Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations

This commit is contained in:
Jaiwanth 2021-06-16 10:52:00 +05:30
commit cff4521106
64 changed files with 1186 additions and 456 deletions

View file

@ -15,17 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// polyfill textencoder if necessary
import * as TextEncodingUtf8 from 'text-encoding-utf-8';
let TextEncoder = window.TextEncoder;
if (!TextEncoder) {
TextEncoder = TextEncodingUtf8.TextEncoder;
}
let TextDecoder = window.TextDecoder;
if (!TextDecoder) {
TextDecoder = TextEncodingUtf8.TextDecoder;
}
import { _t } from '../languageHandler';
import SdkConfig from '../SdkConfig';