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/compose.js
+++ b/app/javascript/gabsocial/actions/compose.js
@@ -12,7 +12,7 @@ import { showAlertForError } from './alerts';
 import { showAlert } from './alerts';
 import { defineMessages } from 'react-intl';
 import { openModal, closeModal } from './modal';
-import { me } from 'gabsocial/initial_state';
+import { me } from '../initial_state';

 let cancelFetchComposeSuggestionsAccounts;