Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct...

diff --cc app/javascript/mastodon/actions/compose.js
Simple merge

diff --cc app/javascript/mastodon/features/getting_started/index.js
index 68267c54f18bc21896af0983f7a889c6cb0dd43e,94dabd4ad395f4b66d25b0efd8efd618f1ad86ba..9b94b983088caf51f92a05720378214970b643cd
--- 1/app/javascript/mastodon/features/getting_started/index.js
--- 2/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@@ -17,8 -16,8 +17,9 @@@ const messages = defineMessages(
    navigation_subheading: { id: 'column_subheading.navigation', defaultMessage: 'Navigation' },
    settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
    community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
+   direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
    preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
 +  settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
    follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
    sign_out: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
    favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },

diff --cc app/javascript/mastodon/features/ui/index.js
Simple merge

diff --cc app/javascript/mastodon/features/ui/util/async-components.js
Simple merge

diff --cc app/javascript/mastodon/reducers/settings.js
Simple merge

diff --cc app/models/status.rb
Simple merge

diff --cc app/views/home/index.html.haml
Simple merge

diff --cc config/routes.rb
Simple merge