Skip to content

Commit

Permalink
Merge branch 'canary' into update/release-stats
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Oct 2, 2020
2 parents 6cf6d9c + 2a047a8 commit 5c0b294
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/basic-features/static-file-serving.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function MyImage() {
export default MyImage
```

This folder is also useful for `robots.txt`, Google Site Verification, and any other static files (including `.html`)!
This folder is also useful for `robots.txt`, `favicon.ico`, Google Site Verification, and any other static files (including `.html`)!

> **Note**: Don't name the `public` directory anything else. The name cannot be changed and is the only directory used to serve static assets.
Expand Down
4 changes: 3 additions & 1 deletion examples/with-mux-video/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ This example uses Mux Video, an API-first platform for video. The example featur

## Demo

### [https://with-mux-video.now.sh/](https://with-mux-video.now.sh/)
### [https://with-mux-video.vercel.app/](https://with-mux-video.vercel.app/)

### This project was used to create [stream.new](https://stream.new/)

## Deploy your own

Expand Down
4 changes: 2 additions & 2 deletions examples/with-mux-video/components/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { MUX_HOME_PAGE_URL } from '../constants'
export default function Layout({
title,
description,
metaTitle,
metaTitle = 'Mux + Next.js',
metaDescription,
image,
image = 'https://with-mux-video.vercel.app/mux-nextjs-og-image.png',
children,
loadTwitterWidget,
}) {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5c0b294

Please sign in to comment.