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

2017-10-25 16:01:20 -05:00
parent 5f0268ab84 a76b024228
commit 42f2045c21
21 changed files with 341 additions and 11 deletions
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -26,6 +26,10 @@ export function HashtagTimeline () {
  return import(/* webpackChunkName: "features/hashtag_timeline" */'../../hashtag_timeline');
 }

+export function DirectTimeline() {
+  return import(/* webpackChunkName: "features/direct_timeline" */'../../direct_timeline');
+}
+
 export function Status () {
  return import(/* webpackChunkName: "features/status" */'../../status');
 }