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

This commit is contained in:
Travis Ralston
2020-06-15 06:54:27 -06:00
34 changed files with 1892 additions and 562 deletions
@@ -98,3 +98,7 @@ limitations under the License.
}
}
}
.mx_CompleteSecurity_resetText {
padding-top: 20px;
}