Merge branch 'develop' into luke/feature-flair

This commit is contained in:
Luke Barnard 2017-09-19 14:55:54 +01:00
commit 5295d7f058
33 changed files with 123 additions and 110 deletions

View file

@ -751,7 +751,7 @@ module.exports = withMatrixClient(React.createClass({
if (kickButton || banButton || muteButton || giveModButton) {
adminTools =
<div>
<h3>{_t("Admin tools")}</h3>
<h3>{_t("Admin Tools")}</h3>
<div className="mx_MemberInfo_buttons">
{muteButton}