Merge branch 'swipe-gestures' of git://github.com/sorin-davidoi/mastodon into sorin...

diff --cc app/javascript/mastodon/features/ui/components/media_modal.js
index 0f4105ee18396ca197935862fa5481ddfacd7fb7,c6b293aeb75968e18d0d2533762bf2dc4f3c88cc..0209bc99b231f288ee39d1ccbde4bb44345f4377
--- 1/app/javascript/mastodon/features/ui/components/media_modal.js
--- 2/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@@ -1,4 -1,6 +1,5 @@@
  import React from 'react';
 -import LoadingIndicator from '../../../components/loading_indicator';
+ import ReactSwipeable from 'react-swipeable';
  import ImmutablePropTypes from 'react-immutable-proptypes';
  import PropTypes from 'prop-types';
  import ExtendedVideoPlayer from '../../../components/extended_video_player';

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge