Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1

This commit is contained in:
Travis Ralston
2019-02-25 09:40:50 -07:00
16 changed files with 111 additions and 93 deletions
@@ -40,6 +40,7 @@ limitations under the License.
}
.mx_WhoIsTypingTile_remainingAvatarPlaceholder {
position: relative;
display: inline-block;
color: #acacac;
background-color: #ddd;