Merge branch 'develop' into travis/fix-group-members

This commit is contained in:
Travis Ralston
2018-10-22 15:02:01 -06:00
17 changed files with 68 additions and 96 deletions
+4
View File
@@ -56,3 +56,7 @@ limitations under the License.
.mx_RoomPreviewBar_warningIcon {
padding: 12px;
}
.mx_RoomPreviewBar_spinnerIntro {
margin-top: 50px;
}