Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #33153: Updating cross-references from master to main + canary #33198

Merged
merged 7 commits into from Jan 12, 2022

Commits on Jan 9, 2022

  1. Copy the full SHA
    df33908 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    ae8e720 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2022

  1. Copy the full SHA
    01f5426 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2022

  1. Supplements vercel#33153 - updating existing cross-references to `mas…

    …ter` branch to renamed default branch of `main`
    mannybecerra committed Jan 11, 2022
    Copy the full SHA
    58d3b16 View commit details
    Browse the repository at this point in the history
  2. Supplements vercel#33153 - updating existing cross-references to `mas…

    …ter` branch to renamed default branch of `main`
    mannybecerra committed Jan 11, 2022
    Copy the full SHA
    635d2e8 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'mannyb/docs' of github.com:mannybecerra/next.js into ma…

    …nnyb/docs
    
    # Conflicts:
    #	docs/api-reference/create-next-app.md
    #	examples/analyze-bundles/README.md
    #	examples/progressive-web-app/pages/index.js
    #	examples/with-apollo-and-redux/README.md
    #	examples/with-cypress/pages/index.js
    #	examples/with-docker/pages/index.js
    #	examples/with-elasticsearch/pages/index.js
    #	examples/with-jest-babel/__tests__/__snapshots__/snapshot.tsx.snap
    #	examples/with-jest-babel/pages/index.tsx
    #	examples/with-jest/__tests__/__snapshots__/snapshot.tsx.snap
    #	examples/with-jest/pages/index.tsx
    #	examples/with-knex/pages/index.js
    #	examples/with-mdbreact/pages/index.js
    #	examples/with-mongodb/pages/index.js
    #	examples/with-playwright/pages/index.js
    #	examples/with-rbx-bulma-pro/pages/index.js
    #	examples/with-react-bootstrap/pages/index.jsx
    #	examples/with-react-with-styles/README.md
    #	examples/with-reactstrap/pages/index.jsx
    #	examples/with-redux-persist/README.md
    #	examples/with-redux-saga/README.md
    #	examples/with-rematch/README.md
    #	examples/with-sitemap/pages/index.js
    #	examples/with-styled-jsx-postcss/README.md
    #	examples/with-supertokens/pages/index.js
    #	examples/with-tailwindcss/pages/index.tsx
    #	examples/with-typestyle/README.md
    #	packages/create-next-app/README.md
    #	packages/create-next-app/templates/default/pages/index.js
    #	packages/create-next-app/templates/typescript/pages/index.tsx
    #	test/development/basic/tailwind-jit/pages/index.js
    mannybecerra committed Jan 11, 2022
    Copy the full SHA
    247c64c View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    9f94dfe View commit details
    Browse the repository at this point in the history