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.

Sign up for GitHub

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

Jump to bottom

Resolve merge conflicts #992

Closed
wants to merge 163 commits into from
Closed

Resolve merge conflicts #992

wants to merge 163 commits into from

Conversation

millicentachieng
Copy link
Contributor

No description provided.

millicentachieng and others added 30 commits August 1, 2023 10:21
@millicentachieng
Merge pull request #374 from microsoftgraph/dev
09e37fd 
Merge dev into master
@andrueastman
Merge pull request #376 from microsoftgraph/dev
e51460e 
Merge dev into master
@millicentachieng
Merge pull request #378 from microsoftgraph/dev
f2c92cd 
Update permissions descriptions with new scopes from Service Principal (#377)
@millicentachieng
Merge pull request #380 from microsoftgraph/dev
92c7ad3 
Update permissions descriptions with new scopes from Service Principal. (#379)
@millicentachieng
Merge pull request #384 from microsoftgraph/dev
c1980eb 
Merge dev into master
@millicentachieng
Merge pull request #386 from microsoftgraph/dev
520ab3f 
Merge dev into master
@millicentachieng
Merge pull request #388 from microsoftgraph/dev
6973ac7 
Update permissions descriptions with new scopes from Service Principal
@millicentachieng
Merge pull request #399 from microsoftgraph/dev
79b3e75 
Merge dev into master
@andrueastman
Merge pull request #403 from microsoftgraph/dev
dd5032f 
Merge dev into master
@andrueastman
Merge pull request #407 from microsoftgraph/dev
a041f2b 
Merge dev to master
@millicentachieng
Merge pull request #410 from microsoftgraph/dev
a57105e 
Merge dev into master
@millicentachieng
Merge pull request #413 from microsoftgraph/dev
8e17453 
Merge dev into master
@millicentachieng
Merge pull request #415 from microsoftgraph/dev
1919f92 
Update permissions reverse lookup table from workloads permissions file
@millicentachieng
Merge pull request #418 from microsoftgraph/dev
27d763b 
Merge dev into master
@millicentachieng
Merge pull request #420 from microsoftgraph/dev
aa36e0a 
Merge dev into master
@millicentachieng
Merge pull request #441 from microsoftgraph/dev
9986be0 
Merge dev into master
@millicentachieng
Merge pull request #445 from microsoftgraph/dev
28d8192 
Merge dev into master
@millicentachieng
Merge pull request #447 from microsoftgraph/dev
1e16647 
Merge dev into master
@millicentachieng
Merge pull request #450 from microsoftgraph/dev
eab016b 
Merge dev into master
@millicentachieng
Merge pull request #455 from microsoftgraph/dev
7d06bdd 
Merge dev into master
@millicentachieng
Merge pull request #457 from microsoftgraph/dev
4dae1ea 
Merge dev into master
@millicentachieng
Merge pull request #461 from microsoftgraph/dev
c01ecae 
Merge dev into master
@millicentachieng
Merge pull request #468 from microsoftgraph/dev
56b5c55 
Merge dev into master
@millicentachieng
Merge pull request #471 from microsoftgraph/dev
b9d2cd8 
Merge dev into master
@millicentachieng
Merge pull request #474 from microsoftgraph/dev
dc33e38 
Merge dev into master
@millicentachieng
Merge pull request #477 from microsoftgraph/dev
d334967 
Merge dev into master
@millicentachieng
Merge pull request #481 from microsoftgraph/dev
832a9c8 
Merge dev into master
@millicentachieng
Merge pull request #484 from microsoftgraph/dev
5cccdd1 
Merge dev into master
@millicentachieng
Merge pull request #487 from microsoftgraph/dev
8bbb9ea 
Merge dev into master
@millicentachieng
Merge pull request #490 from microsoftgraph/dev
d38633d 
Merge dev into master
millicentachieng and others added 29 commits November 12, 2024 09:32
@millicentachieng
Merge pull request #869 from microsoftgraph/dev
cbd2022 
Merge dev into master
@millicentachieng
Merge pull request #871 from microsoftgraph/dev
8fb106a 
Merge dev into master
@millicentachieng
Merge pull request #873 from microsoftgraph/dev
103c318 
Merge dev into master
@millicentachieng
Merge pull request #879 from microsoftgraph/dev
4a40202 
Merge dev into master
@millicentachieng
Merge pull request #883 from microsoftgraph/dev
be3776a 
Merge dev into master
@millicentachieng
Merge pull request #891 from microsoftgraph/dev
4b138f3 
Merge dev into master
@millicentachieng
Merge pull request #896 from microsoftgraph/dev
9dd9ae5 
Merge dev into master
@millicentachieng
Merge pull request #899 from microsoftgraph/dev
88defa1 
Merge dev into master
@millicentachieng
Merge pull request #901 from microsoftgraph/dev
e32b199 
Merge dev into master
@millicentachieng
Merge pull request #905 from microsoftgraph/dev
2f6f0d7 
Merge dev into master
@millicentachieng
Merge pull request #907 from microsoftgraph/dev
525e003 
Merge dev into master
@millicentachieng
Merge pull request #911 from microsoftgraph/dev
fd67c17 
Merge dev into master
@millicentachieng
Merge pull request #913 from microsoftgraph/dev
d61ce97 
Merge dev into master
@millicentachieng
Merge pull request #919 from microsoftgraph/dev
12ba105 
Merge dev into master
@millicentachieng
Merge pull request #923 from microsoftgraph/dev
a900288 
Merge dev into master
@millicentachieng
Merge pull request #925 from microsoftgraph/dev
527a67e 
Merge dev into master
@millicentachieng
Merge pull request #940 from microsoftgraph/dev
635c3fd 
Merge dev into master
@millicentachieng
Merge pull request #945 from microsoftgraph/dev
47a12bb 
Merge dev into master
@millicentachieng
Merge pull request #947 from microsoftgraph/dev
f4ec102 
Merge dev into master
@millicentachieng
Merge pull request #951 from microsoftgraph/dev
7721376 
Merge dev into master
@millicentachieng
Merge pull request #953 from microsoftgraph/dev
0ce649f 
Merge dev into master
@millicentachieng
Merge pull request #958 from microsoftgraph/dev
b2b307b 
Merge dev into master
@millicentachieng @content-assistant
@marabooy @andrueastman
Merge dev into master (#964)
bc5b070 
* Update permissions descriptions with new scopes from Service Principal. (#961)

Co-authored-by: content-assistant[bot] <67429574+content-assistant[bot]@users.noreply.github.com>

* Weekly Permissions sync 2025-01-14

* Weekly Permissions sync 2025-01-15

---------

Co-authored-by: content-assistant[bot] <67429574+content-assistant[bot]@users.noreply.github.com>
Co-authored-by: David <[email protected]>
Co-authored-by: Andrew Omondi <[email protected]>
@millicentachieng
Merge pull request #972 from microsoftgraph/dev
839b6a2 
Merge dev into master
@millicentachieng
Merge pull request #977 from microsoftgraph/dev
9b44a5f 
Merge dev into master
@millicentachieng
Merge pull request #983 from microsoftgraph/dev
5073b52 
Merge dev into master
@millicentachieng
Merge pull request #987 from microsoftgraph/dev
237fbb8 
Merge dev into master
@millicentachieng
Merge pull request #989 from microsoftgraph/dev
740cd0c 
Merge dev into master
@millicentachieng
Merge branch 'master' of https://github.com/microsoftgraph/microsoft-…
d60df74 
…graph-devx-content into resolve-merge-conflicts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@millicentachieng @andrueastman