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/reducers/polls.js
+++ b/app/javascript/gabsocial/reducers/polls.js
@@ -1,4 +1,4 @@
-import { POLLS_IMPORT } from 'gabsocial/actions/importer';
+import { POLLS_IMPORT } from '../actions/importer';
 import { Map as ImmutableMap, fromJS } from 'immutable';

 const importPolls = (state, polls) => state.withMutations(map => polls.forEach(poll => map.set(poll.id, fromJS(poll))));