Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings

2017-10-04 10:37:45 +01:00 · 2017-10-04 10:37:45 +01:00 · 28b8582bd6
commit 28b8582bd6
parent 4e9694be6d 011aadcb94
9 changed files with 64 additions and 56 deletions
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@ -258,7 +258,6 @@ module.exports = React.createClass({
                <div className="mx_RoomSettings_aliasLabel">
                    { _t('The main address for this room is') }: { canonical_alias_section }
                </div>
-
                <EditableItemList
                    className={"mx_RoomSettings_localAliases"}
                    items={this.state.domainToAliases[localDomain] || []}