Merge branch 'dbkr/e2e_backups' into dbkr/e2e_backups_passphrase

This commit is contained in:
David Baker 2018-11-20 18:10:57 +00:00
commit 6fe2c9c2bb
47 changed files with 2575 additions and 202 deletions

View file

@ -24,4 +24,8 @@ limitations under the License.
@mixin mx_DialogButton;
background-color: $primary-bg-color;
color: $accent-color;
}
}
.mx_EncryptedEventDialog button {
margin-top: 0px;
}