Merge branch 'kegan/invite-search' into matthew/roompreview

2016-01-18 18:00:58 +00:00 · 2016-01-18 18:00:58 +00:00 · d5c291ae62
commit d5c291ae62
parent d6f6f32c74 317e1fb9cd
8 changed files with 1153 additions and 61 deletions
--- a/src/components/views/login/VectorCustomServerDialog.js
+++ b/src/components/views/login/VectorCustomServerDialog.js
@ -25,7 +25,7 @@ module.exports = React.createClass({
    render: function() {
        return (
            <div className="mx_ErrorDialog">
-                <div className="mx_ErrorDialogTitle">
+                <div className="mx_Dialog_title">
                    Custom Server Options
                </div>
                <div className="mx_Dialog_content">
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js