diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-13 23:46:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 23:46:09 +0200 |
| commit | e1d282023432ff4a88cb795f3a9889704314e448 (patch) | |
| tree | 89f9525142d0bf876a4fb6e0117163c0a76bb78a /app/javascript/flavours/glitch/features/public_timeline/containers/column_settings_container.js | |
| parent | c6ff4c634caf718adf7280e04909c091d15add1d (diff) | |
| parent | d147dd7588502f22ac825780bb1d6e54eb3613e6 (diff) | |
Merge pull request #1327 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/public_timeline/containers/column_settings_container.js')
| -rw-r--r-- | app/javascript/flavours/glitch/features/public_timeline/containers/column_settings_container.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/public_timeline/containers/column_settings_container.js b/app/javascript/flavours/glitch/features/public_timeline/containers/column_settings_container.js index ec4d74737..5091bfb90 100644 --- a/app/javascript/flavours/glitch/features/public_timeline/containers/column_settings_container.js +++ b/app/javascript/flavours/glitch/features/public_timeline/containers/column_settings_container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux'; -import ColumnSettings from 'flavours/glitch/features/community_timeline/components/column_settings'; +import ColumnSettings from '../components/column_settings'; import { changeSetting } from 'flavours/glitch/actions/settings'; import { changeColumnParams } from 'flavours/glitch/actions/columns'; |