Updating files after merge

2020-01-29 11:45:17 -05:00
parent 8c9cac2beb
commit 2bd01457a6
48 changed files with 106 additions and 165 deletions
--- a/app/javascript/gabsocial/features/account_gallery/components/media_item/media_item.js
+++ b/app/javascript/gabsocial/features/account_gallery/components/media_item/media_item.js
@@ -5,7 +5,6 @@ import { autoPlayGif, displayMedia } from 'gabsocial/initial_state';
 import classNames from 'classnames';
 import { decode } from 'blurhash';
 import { isIOS } from 'gabsocial/utils/is_mobile';
-import conversations_list_container from '../../direct_timeline/containers/conversations_list_container';

 import './media_item.scss';