Merge branch 'develop' into travis/custom-status

This commit is contained in:
Travis Ralston
2018-12-19 10:33:34 -07:00
34 changed files with 556 additions and 233 deletions
@@ -40,4 +40,5 @@ limitations under the License.
.mx_RoomRecoveryReminder_button.mx_RoomRecoveryReminder_secondary {
@mixin mx_DialogButton_secondary;
background-color: transparent;
}