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/actions/conversations.js
+++ b/app/javascript/gabsocial/actions/conversations.js
@@ -4,7 +4,7 @@ import {
  importFetchedStatuses,
  importFetchedStatus,
 } from './importer';
-import { me } from 'gabsocial/initial_state';
+import { me } from '../initial_state';

 export const CONVERSATIONS_MOUNT   = 'CONVERSATIONS_MOUNT';
 export const CONVERSATIONS_UNMOUNT = 'CONVERSATIONS_UNMOUNT';