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

Merge main -> master #2154

Merged
merged 7 commits into from
Feb 23, 2021
Merged

Merge main -> master #2154

merged 7 commits into from
Feb 23, 2021

Conversation

alisonjoseph
Copy link
Member

Some of the designers PRs got merged into main by default, but we are still using master.

laurenmrice and others added 6 commits February 3, 2021 08:35
New:
- Added maintainer name and link to bluepages

Changed:
- Updated design kit link
* fix: update content for design kit

New:
- Added maintainer name and link to bluepages

Changed:
- Updated design kit link

* edit: move maintainer section
* Update resource card link

Resource was not downloading but had correct link. Just linking to the Sketch Cloud page for now.

* add missing bracket

Co-authored-by: Alison Joseph <alisonejoseph@Gmail.com>
@alisonjoseph alisonjoseph requested a review from a team February 23, 2021 16:22
@alisonjoseph alisonjoseph requested a review from a team as a code owner February 23, 2021 16:22
@vercel
Copy link

vercel bot commented Feb 23, 2021

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/carbon-design-system/carbondesignsystem/8hFmqvZVjnpktfGx5gjFVeYqXU2x
✅ Preview: https://carbondesignsystem-git-main-carbon-design-system.vercel.app

@kodiakhq kodiakhq bot merged commit bac914b into master Feb 23, 2021
@kodiakhq kodiakhq bot deleted the main branch February 23, 2021 16:52
natashadecoste pushed a commit to natashadecoste/carbon-website that referenced this pull request May 19, 2021
* fix: update content for design kit

New:
- Added maintainer name and link to bluepages

Changed:
- Updated design kit link

* fix: update content for design kit (carbon-design-system#2120)

* fix: update content for design kit

New:
- Added maintainer name and link to bluepages

Changed:
- Updated design kit link

* edit: move maintainer section

* Fix typo

* Update resource card link (carbon-design-system#2135)

* Update resource card link

Resource was not downloading but had correct link. Just linking to the Sketch Cloud page for now.

* add missing bracket

Co-authored-by: Alison Joseph <alisonejoseph@Gmail.com>

* update Sketch resource card link (carbon-design-system#2141)

Co-authored-by: Lauren Rice <43969356+laurenmrice@users.noreply.github.com>
Co-authored-by: makeupsomething <darylcoleoffice@gmail.com>
Co-authored-by: Anna Gonzales <anna.gonzales3@gmail.com>
Co-authored-by: Taylor Jones <tay1orjones@users.noreply.github.com>
natashadecoste pushed a commit to natashadecoste/carbon-website that referenced this pull request May 19, 2021
* fix: update content for design kit

New:
- Added maintainer name and link to bluepages

Changed:
- Updated design kit link

* fix: update content for design kit (carbon-design-system#2120)

* fix: update content for design kit

New:
- Added maintainer name and link to bluepages

Changed:
- Updated design kit link

* edit: move maintainer section

* Fix typo

* Update resource card link (carbon-design-system#2135)

* Update resource card link

Resource was not downloading but had correct link. Just linking to the Sketch Cloud page for now.

* add missing bracket

Co-authored-by: Alison Joseph <alisonejoseph@Gmail.com>

* update Sketch resource card link (carbon-design-system#2141)

Co-authored-by: Lauren Rice <43969356+laurenmrice@users.noreply.github.com>
Co-authored-by: makeupsomething <darylcoleoffice@gmail.com>
Co-authored-by: Anna Gonzales <anna.gonzales3@gmail.com>
Co-authored-by: Taylor Jones <tay1orjones@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants