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/domain_blocks.js
+++ b/app/javascript/gabsocial/actions/domain_blocks.js
@@ -1,5 +1,5 @@
 import api, { getLinks } from '../api';
-import { me } from 'gabsocial/initial_state';
+import { me } from '../initial_state';

 export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
 export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';