5 files changed, 7 insertions(+), 5 deletions(-)

M .eslintrc.js
M app/javascript/flavours/glitch/features/public_timeline/index.jsx
M app/javascript/mastodon/features/getting_started/components/announcements.jsx
M app/javascript/mastodon/features/home_timeline/components/explore_prompt.jsx
M app/javascript/mastodon/features/onboarding/index.jsx

@@ 247,7 247,12 @@ module.exports = {
           },
           // Internal packages
           {
-            pattern: '{mastodon/**,flavours/glitch-soc/**}',
+            pattern: '{mastodon/**}',
+            group: 'internal',
+            position: 'after',
+          },
+          {
+            pattern: '{flavours/glitch-soc/**}',
             group: 'internal',
             position: 'after',
           },

@@ 13,8 13,8 @@ import { expandPublicTimeline } from 'flavours/glitch/actions/timelines';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
 import DismissableBanner from 'flavours/glitch/components/dismissable_banner';
-import { domain } from 'flavours/glitch/initial_state';
 import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container';
+import { domain } from 'flavours/glitch/initial_state';
 
 import ColumnSettingsContainer from './containers/column_settings_container';
 

@@ 13,7 13,6 @@ import spring from 'react-motion/lib/spring';
 import ReactSwipeableViews from 'react-swipeable-views';
 
 import elephantUIPlane from 'mastodon/../images/elephant_ui_plane.svg';
-
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import { Icon }  from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';

@@ 5,7 5,6 @@ import { FormattedMessage } from 'react-intl';
 import { Link } from 'react-router-dom';
 
 import background from 'mastodon/../images/friends-cropped.png';
-
 import DismissableBanner from 'mastodon/components/dismissable_banner';
 
 

@@ 12,7 12,6 @@ import { connect } from 'react-redux';
 import { debounce } from 'lodash';
 
 import illustration from 'mastodon/../images/elephant_ui_conversation.svg';
-
 import { fetchAccount } from 'mastodon/actions/accounts';
 import { focusCompose } from 'mastodon/actions/compose';
 import { closeOnboarding } from 'mastodon/actions/onboarding';