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/components/promo_panel/promo_panel.js
+++ b/app/javascript/gabsocial/components/promo_panel/promo_panel.js
@@ -1,5 +1,5 @@
 import { FormattedMessage } from 'react-intl';
-import Icon from 'gabsocial/components/icon';
+import Icon from '../icon';

 import './promo_panel.scss';