Merge pull request #399 from ticky/public-timeline-de-hoist

Public timeline de-hoist

diff --cc app/assets/javascripts/components/features/getting_started/index.jsx
index ae850c3f9a7cdd1309215ab5df11613c98d285fa,9f47e7ab47f87db1855f926836a40210e463b7bf..8f56ba39f23d199e93a5e01b2e934d30c046ea86
--- 1/app/assets/javascripts/components/features/getting_started/index.jsx
--- 2/app/assets/javascripts/components/features/getting_started/index.jsx
+++ b/app/assets/javascripts/components/features/getting_started/index.jsx
@@@ -37,9 -26,8 +26,8 @@@ const GettingStarted = ({ intl, me }) =
    return (
      <Column icon='asterisk' heading={intl.formatMessage(messages.heading)}>
        <div style={{ position: 'relative' }}>
-         <div style={hamburgerStyle}><i className='fa fa-bars' /></div>
          <ColumnLink icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />
 -        <ColumnLink icon='cog' text={intl.formatMessage(messages.settings)} href='/settings/profile' />
 +        <ColumnLink icon='cog' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />
          {followRequests}
        </div>