imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093

Browse source 
 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
	src/dispatcher/actions.ts
	src/i18n/strings/en_EN.json
This commit is contained in:
Michael Telatynski 2021-07-29 16:09:18 +01:00
commit 02dbdc5c0a
41 changed files with 1672 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/css/views/context_menus/_IconizedContextMenu.scss
View file

@ -99,6 +99,10 @@ limitations under the License.
.mx_IconizedContextMenu_icon + .mx_IconizedContextMenu_label {
padding-left: 14px;
}
.mx_BetaCard_betaPill {
margin-left: 16px;
}
}
}