Merge branch 'develop' into travis/room-list/sticky

2020-06-15 06:54:27 -06:00 · 2020-06-15 06:54:27 -06:00 · 8596905cee
commit 8596905cee
parent eeac80096c 94f52c4ee2
34 changed files with 1892 additions and 562 deletions
--- a/res/css/structures/auth/_CompleteSecurity.scss
+++ b/res/css/structures/auth/_CompleteSecurity.scss
@ -98,3 +98,7 @@ limitations under the License.
        }
    }
 }
+
+.mx_CompleteSecurity_resetText {
+    padding-top: 20px;
+}