Merge upstream (#111)

This commit is contained in:
kibigo!
2017-08-01 13:07:43 -07:00
205 changed files with 1927 additions and 1507 deletions

View File

@@ -110,9 +110,9 @@ export function SettingsModal () {
// IF MASTODON EVER CHANGES DETAILED STATUSES TO REQUIRE THEM, WE'LL NEED TO UPDATE THE URLS OR SOMETHING LOL. //
export function MediaGallery () {
return import(/* webpackChunkName: "status/MediaGallery" */'../../../components/media_gallery');
return import(/* webpackChunkName: "status/media_gallery" */'../../../components/media_gallery');
}
export function VideoPlayer () {
return import(/* webpackChunkName: "status/VideoPlayer" */'../../../components/video_player');
return import(/* webpackChunkName: "status/video_player" */'../../../components/video_player');
}