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

This commit is contained in:
Weblate
2018-11-08 20:53:05 +00:00
@@ -24,5 +24,8 @@ limitations under the License.
@mixin mx_DialogButton;
background-color: $primary-bg-color;
color: $accent-color;
}
.mx_EncryptedEventDialog button {
margin-top: 0px;
}