Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

2018-10-02 16:59:15 +01:00 · 2018-10-02 16:59:15 +01:00 · fa30707eae
commit fa30707eae
parent 5ba45a71e8 3cc4ea5ecb
38 changed files with 1067 additions and 593 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@ -814,7 +814,7 @@ module.exports = React.createClass({
        }
        return (
            <div>
-                <h3>{ _t("Debug Logs Submission") }</h3>
+                <h3>{ _t("Submit Debug Logs") }</h3>
                <div className="mx_UserSettings_section">
                    <p>{
                        _t( "If you've submitted a bug via GitHub, debug logs can help " +