Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

2018-11-20 18:08:39 +00:00
parent 6d6e6b5a4e 93cd3b4206
commit 8ccaf53d20
47 changed files with 2578 additions and 205 deletions
@@ -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;
+}