Merge nheko-im/master and fix conflicts

fff130d3 · Joe Donofry · 53518ccd · 981c7ab3 · fff130d3 · fff130d3
Verified Commit fff130d3 authored 3 years ago by Joe Donofry
--- a/src/RegisterPage.cpp
+++ b/src/RegisterPage.cpp
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
--- a/src/timeline/CommunitiesModel.cpp
+++ b/src/timeline/CommunitiesModel.cpp
--- a/src/timeline/RoomlistModel.cpp
+++ b/src/timeline/RoomlistModel.cpp
--- a/src/ui/MxcMediaProxy.cpp
+++ b/src/ui/MxcMediaProxy.cpp
--- a/src/ui/MxcMediaProxy.h
+++ b/src/ui/MxcMediaProxy.h
--- a/src/ui/Theme.h
+++ b/src/ui/Theme.h