Merge branch 'master' into develop

Author: RiotRobot

CHANGELOG.md

@@ -1,3 +1,12 @@
+Changes in [2.2.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.1) (2020-03-04)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.0...v2.2.1)
+
+ * Adjust scroll offset with relative scrolling
+ [\#4171](https://github.com/matrix-org/matrix-react-sdk/pull/4171)
+ * Disable registration flows on SSO servers
+ [\#4169](https://github.com/matrix-org/matrix-react-sdk/pull/4169)
+
 Changes in [2.2.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.2.0) (2020-03-02)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.2.0-rc.1...v2.2.0)

package.json

@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
- "version": "2.2.0",
+ "version": "2.2.1",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {

src/components/views/elements/ImageView.js

@@ -216,7 +216,7 @@ export default class ImageView extends React.Component {
  { this.getName() }
  </div>
  { eventMeta }
- <a className="mx_ImageView_link" href={ this.props.src } download={ this.props.name } rel="noreferrer noopener">
+ <a className="mx_ImageView_link" href={ this.props.src } download={ this.props.name } target="_blank" rel="noopener">
  <div className="mx_ImageView_download">
  { _t('Download this file') }<br />
  <span className="mx_ImageView_size">{ sizeRes }</span>