From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 23 Jun 2017 15:52:39 +0000 (+0200)
Subject: Merge branch 'swipe-gestures' of git://github.com/sorin-davidoi/mastodon into sorin... 
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=281f07244ba23084bb7caed040098518a5dad9b4;p=mastodon.git

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

281f07244ba23084bb7caed040098518a5dad9b4
diff --cc app/javascript/mastodon/features/ui/components/media_modal.js
index 0f4105ee1,c6b293aeb..0209bc99b
--- a/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 ReactSwipeable from 'react-swipeable';
 -import LoadingIndicator from '../../../components/loading_indicator';
  import ImmutablePropTypes from 'react-immutable-proptypes';
  import PropTypes from 'prop-types';
  import ExtendedVideoPlayer from '../../../components/extended_video_player';