…nto ia-updates

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

…nto ia-updates-1516

# Conflicts:
#	src/pages/designing/design-resources/index.mdx

…bon-website into pr/alisonjoseph/1571

…nto ia-updates-1516

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

…bon-website into pr/alisonjoseph/1571

…nto ia-updates-1516

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

…ite into ia-updates-1516

* 'ia-updates-1516' of github.com:alisonjoseph/carbon-website:
  docs: broken link fixes

…nto ia-updates-1516

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

…nto ia-updates-1516

# Conflicts:
#	conf.d/rewrite.conf
#	src/data/nav-items.yaml

…ite into ia-updates-1516

* 'ia-updates-1516' of github.com:alisonjoseph/carbon-website:
  docs: 404 update
  docs: get started updates
  docs: editing, add new dev get started page
  Update nav-items.yaml
  Update nav-items.yaml

…nto ia-updates-1516

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

…nto ia-updates-1516

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

…nto ia-updates-1516

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

…bon-website into pr/alisonjoseph/1571

…ite into ia-updates-1516

* 'ia-updates-1516' of github.com:alisonjoseph/carbon-website:
  update hex values for hover-primary-text token (#1611)

Co-authored-by: Vince Picone <[email protected]>

Co-authored-by: jillianhowarth <[email protected]>

…bon-website into pr/alisonjoseph/1571

…nto ia-updates-1516

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.