Skip to content

[Please ignore] Sample PR For Katherine#5114

Closed
Markionium wants to merge 16 commits intomicrosoft:masterfrom
Markionium:mark/charting
Closed

[Please ignore] Sample PR For Katherine#5114
Markionium wants to merge 16 commits intomicrosoft:masterfrom
Markionium:mark/charting

Conversation

@Markionium
Copy link
Copy Markdown
Member

@Markionium Markionium commented Jun 6, 2018

@kkjeer This is what your PR would look like against master if you were to merge kkjeer#1

Microsoft Reviewers: Open in CodeFlow

Katherine Kjeer and others added 16 commits May 22, 2018 14:21
…c-react into charting

# Conflicts:
#	common/config/rush/npm-shrinkwrap.json
…c-react into charting

# Conflicts:
#	common/config/rush/npm-shrinkwrap.json
…c-react into charting

# Conflicts:
#	common/changes/@uifabric/example-app-base/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/experiments/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/fabric-website/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/file-type-icons/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/icons/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/jest-serializer-merge-styles/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/merge-styles/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/styling/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/utilities/applied-prettier_2018-06-02-22-17.json
#	common/changes/@uifabric/variants/applied-prettier_2018-06-02-22-17.json
#	common/changes/office-ui-fabric-react/applied-prettier_2018-06-02-22-17.json
#	common/changes/office-ui-fabric-react/commandbar-fabricjs_2018-06-04-19-00.json
* master:
  Part 2 of demo page refactor (microsoft#5089)
  Update jest.js
  fixing official example page and datepicker/calendar components using… (microsoft#5108)
  Don't run prettier and tslint in parallel as it might cause conflicts (microsoft#5100)
  FocusTrapZone - restore last focused descendant element (microsoft#5103)
  Coachmark/TeachingBubble: Fix SCSS selectors for buttons and Close Icon (microsoft#4835)
  HoverCard: IE11 fix (microsoft#5105)
@Markionium Markionium closed this Jun 6, 2018
@microsoft microsoft locked as resolved and limited conversation to collaborators Aug 30, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant