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

Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode

Browse source 
 Conflicts:
	package.json
This commit is contained in:
Michael Telatynski 2020-05-14 10:50:42 +01:00
commit 1ba19e78f8
476 changed files with 8624 additions and 2356 deletions
Download patch file Download diff file Expand all files Collapse all files

6
res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
View file

@ -32,3 +32,9 @@ limitations under the License.
padding: 10px;
}
.mx_RestoreKeyBackupDialog_content > div {
display: flex;
flex-direction: column;
justify-content: space-between;
min-height: 110px; /* Empirically measured */
}