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

Resolve merge conflicts #992

Closed
wants to merge 163 commits into from
Closed

Resolve merge conflicts #992

Changes from all commits
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
09e37fd
Merge pull request #374 from microsoftgraph/dev
millicentachieng Aug 1, 2023
e51460e
Merge pull request #376 from microsoftgraph/dev
andrueastman Aug 18, 2023
f2c92cd
Merge pull request #378 from microsoftgraph/dev
millicentachieng Aug 22, 2023
92c7ad3
Merge pull request #380 from microsoftgraph/dev
millicentachieng Sep 1, 2023
c1980eb
Merge pull request #384 from microsoftgraph/dev
millicentachieng Oct 3, 2023
520ab3f
Merge pull request #386 from microsoftgraph/dev
millicentachieng Oct 5, 2023
6973ac7
Merge pull request #388 from microsoftgraph/dev
millicentachieng Oct 23, 2023
79b3e75
Merge pull request #399 from microsoftgraph/dev
millicentachieng Nov 1, 2023
dd5032f
Merge pull request #403 from microsoftgraph/dev
andrueastman Nov 21, 2023
a041f2b
Merge pull request #407 from microsoftgraph/dev
andrueastman Nov 22, 2023
a57105e
Merge pull request #410 from microsoftgraph/dev
millicentachieng Nov 30, 2023
8e17453
Merge pull request #413 from microsoftgraph/dev
millicentachieng Dec 6, 2023
1919f92
Merge pull request #415 from microsoftgraph/dev
millicentachieng Dec 7, 2023
27d763b
Merge pull request #418 from microsoftgraph/dev
millicentachieng Dec 18, 2023
aa36e0a
Merge pull request #420 from microsoftgraph/dev
millicentachieng Dec 18, 2023
9986be0
Merge pull request #441 from microsoftgraph/dev
millicentachieng Jan 11, 2024
28d8192
Merge pull request #445 from microsoftgraph/dev
millicentachieng Jan 12, 2024
1e16647
Merge pull request #447 from microsoftgraph/dev
millicentachieng Jan 15, 2024
eab016b
Merge pull request #450 from microsoftgraph/dev
millicentachieng Jan 16, 2024
7d06bdd
Merge pull request #455 from microsoftgraph/dev
millicentachieng Jan 19, 2024
4dae1ea
Merge pull request #457 from microsoftgraph/dev
millicentachieng Jan 23, 2024
c01ecae
Merge pull request #461 from microsoftgraph/dev
millicentachieng Jan 24, 2024
56b5c55
Merge pull request #468 from microsoftgraph/dev
millicentachieng Jan 29, 2024
b9d2cd8
Merge pull request #471 from microsoftgraph/dev
millicentachieng Jan 30, 2024
dc33e38
Merge pull request #474 from microsoftgraph/dev
millicentachieng Jan 31, 2024
d334967
Merge pull request #477 from microsoftgraph/dev
millicentachieng Feb 1, 2024
832a9c8
Merge pull request #481 from microsoftgraph/dev
millicentachieng Feb 6, 2024
5cccdd1
Merge pull request #484 from microsoftgraph/dev
millicentachieng Feb 8, 2024
8bbb9ea
Merge pull request #487 from microsoftgraph/dev
millicentachieng Feb 12, 2024
d38633d
Merge pull request #490 from microsoftgraph/dev
millicentachieng Feb 14, 2024
b07ba20
Merge pull request #492 from microsoftgraph/dev
millicentachieng Feb 15, 2024
a4459e2
Merge pull request #494 from microsoftgraph/dev
millicentachieng Feb 16, 2024
52c8954
Merge pull request #496 from microsoftgraph/dev
millicentachieng Feb 19, 2024
c01ea6f
Merge pull request #500 from microsoftgraph/dev
millicentachieng Feb 22, 2024
cfbbca7
Merge pull request #506 from microsoftgraph/dev
millicentachieng Feb 27, 2024
70c634b
Merge pull request #508 from microsoftgraph/dev
millicentachieng Feb 28, 2024
4b213ca
Merge pull request #510 from microsoftgraph/dev
millicentachieng Feb 29, 2024
c4f0af6
Merge pull request #512 from microsoftgraph/dev
millicentachieng Mar 4, 2024
4183235
Merge pull request #516 from microsoftgraph/dev
millicentachieng Mar 5, 2024
8ac8825
Merge pull request #519 from microsoftgraph/dev
millicentachieng Mar 6, 2024
995a6bf
Merge pull request #521 from microsoftgraph/dev
millicentachieng Mar 7, 2024
917d010
Merge pull request #523 from microsoftgraph/dev
millicentachieng Mar 11, 2024
5ec25ce
Merge pull request #526 from microsoftgraph/dev
millicentachieng Mar 12, 2024
1d3c5b4
Merge pull request #530 from microsoftgraph/dev
millicentachieng Mar 13, 2024
eae78de
Merge pull request #541 from microsoftgraph/dev
millicentachieng Mar 20, 2024
e0589fc
Merge pull request #543 from microsoftgraph/dev
millicentachieng Mar 22, 2024
d78b106
Merge pull request #545 from microsoftgraph/dev
millicentachieng Mar 25, 2024
1b1c197
Merge pull request #551 from microsoftgraph/dev
millicentachieng Mar 27, 2024
f37dd6c
Merge pull request #554 from microsoftgraph/dev
millicentachieng Mar 28, 2024
599d782
Merge pull request #560 from microsoftgraph/dev
millicentachieng Apr 2, 2024
f29dcf8
Merge pull request #563 from microsoftgraph/dev
millicentachieng Apr 5, 2024
7c861a6
Merge pull request #565 from microsoftgraph/dev
millicentachieng Apr 8, 2024
4dd6447
Merge pull request #570 from microsoftgraph/dev
millicentachieng Apr 11, 2024
319815e
Merge pull request #573 from microsoftgraph/dev
millicentachieng Apr 15, 2024
353415d
Merge pull request #577 from microsoftgraph/dev
millicentachieng Apr 17, 2024
1a54e09
Merge pull request #580 from microsoftgraph/dev
millicentachieng Apr 18, 2024
08926bc
Merge pull request #582 from microsoftgraph/dev
millicentachieng Apr 19, 2024
38e1456
Merge pull request #584 from microsoftgraph/dev
millicentachieng Apr 22, 2024
2bcb93a
Merge pull request #587 from microsoftgraph/dev
millicentachieng Apr 24, 2024
cb3c4e5
Merge pull request #591 from microsoftgraph/dev
millicentachieng Apr 25, 2024
e3a235b
Merge pull request #596 from microsoftgraph/dev
millicentachieng May 2, 2024
6cf16ef
Merge pull request #600 from microsoftgraph/dev
millicentachieng May 6, 2024
66d0b3a
Merge pull request #602 from microsoftgraph/dev
millicentachieng May 7, 2024
c63ad31
Merge pull request #604 from microsoftgraph/dev
millicentachieng May 8, 2024
974fbe6
Merge pull request #607 from microsoftgraph/dev
millicentachieng May 9, 2024
b227000
Merge pull request #610 from microsoftgraph/dev
millicentachieng May 13, 2024
668d1e3
Merge pull request #612 from microsoftgraph/dev
millicentachieng May 14, 2024
2aa37e9
Merge pull request #616 from microsoftgraph/dev
millicentachieng May 15, 2024
1bd25fa
Merge pull request #623 from microsoftgraph/dev
millicentachieng May 20, 2024
71389b4
Merge pull request #627 from microsoftgraph/dev
millicentachieng May 22, 2024
c35d0fe
Merge pull request #631 from microsoftgraph/dev
millicentachieng May 23, 2024
f059b68
Merge pull request #635 from microsoftgraph/dev
millicentachieng May 24, 2024
c201cf8
Merge pull request #641 from microsoftgraph/dev
millicentachieng May 29, 2024
e804674
Merge pull request #644 from microsoftgraph/dev
andrueastman May 30, 2024
540880f
Merge pull request #647 from microsoftgraph/dev
millicentachieng May 31, 2024
e5be839
Merge pull request #649 from microsoftgraph/dev
millicentachieng Jun 3, 2024
6cb8dc2
Merge pull request #651 from microsoftgraph/dev
millicentachieng Jun 4, 2024
3716cdf
Merge pull request #653 from microsoftgraph/dev
millicentachieng Jun 12, 2024
a9d0db7
Merge pull request #656 from microsoftgraph/dev
millicentachieng Jun 13, 2024
cf5d7a8
Merge pull request #668 from microsoftgraph/dev
millicentachieng Jun 27, 2024
a85d870
Merge pull request #670 from microsoftgraph/dev
millicentachieng Jun 28, 2024
440aa84
Merge pull request #672 from microsoftgraph/dev
millicentachieng Jul 1, 2024
db8e9f1
Merge pull request #675 from microsoftgraph/dev
millicentachieng Jul 3, 2024
97a02cc
Merge pull request #677 from microsoftgraph/dev
millicentachieng Jul 5, 2024
942e1ed
Merge pull request #683 from microsoftgraph/dev
millicentachieng Jul 12, 2024
1114336
Merge pull request #685 from microsoftgraph/dev
millicentachieng Jul 15, 2024
34cb0e5
Merge pull request #687 from microsoftgraph/dev
millicentachieng Jul 16, 2024
4932f8b
Merge pull request #695 from microsoftgraph/dev
millicentachieng Jul 24, 2024
fea8967
Merge pull request #700 from microsoftgraph/dev
millicentachieng Jul 29, 2024
ff1ae0e
Merge pull request #702 from microsoftgraph/dev
millicentachieng Jul 30, 2024
f9d2e5d
Merge pull request #705 from microsoftgraph/dev
millicentachieng Jul 31, 2024
ab02f4e
Merge pull request #707 from microsoftgraph/dev
millicentachieng Aug 1, 2024
5671194
Merge pull request #709 from microsoftgraph/dev
millicentachieng Aug 2, 2024
e61d4af
Merge pull request #711 from microsoftgraph/dev
millicentachieng Aug 5, 2024
71aa0eb
Merge pull request #713 from microsoftgraph/dev
millicentachieng Aug 6, 2024
e020826
Merge pull request #715 from microsoftgraph/dev
millicentachieng Aug 7, 2024
9d1a2f3
Merge pull request #718 from microsoftgraph/dev
millicentachieng Aug 9, 2024
3e8dac5
Merge pull request #720 from microsoftgraph/dev
millicentachieng Aug 12, 2024
9e0b5ee
Merge pull request #724 from microsoftgraph/dev
millicentachieng Aug 14, 2024
25b8853
Merge pull request #726 from microsoftgraph/dev
millicentachieng Aug 16, 2024
80a7726
Merge pull request #728 from microsoftgraph/dev
millicentachieng Aug 16, 2024
e0f9923
Merge pull request #732 from microsoftgraph/dev
millicentachieng Aug 19, 2024
9c3470b
Merge pull request #736 from microsoftgraph/dev
millicentachieng Aug 21, 2024
42e9f53
Merge pull request #739 from microsoftgraph/dev
millicentachieng Aug 22, 2024
4cd7942
Merge pull request #741 from microsoftgraph/dev
millicentachieng Aug 23, 2024
9e9aafe
Merge pull request #745 from microsoftgraph/dev
millicentachieng Aug 26, 2024
edbabfd
Merge pull request #748 from microsoftgraph/dev
millicentachieng Aug 28, 2024
43dd646
Merge pull request #750 from microsoftgraph/dev
millicentachieng Aug 29, 2024
d90f451
Merge pull request #755 from microsoftgraph/dev
millicentachieng Sep 2, 2024
bc1e6c6
Merge pull request #766 from microsoftgraph/dev
millicentachieng Sep 9, 2024
06bfb65
Merge pull request #771 from microsoftgraph/dev
millicentachieng Sep 11, 2024
6241b36
Merge pull request #773 from microsoftgraph/dev
millicentachieng Sep 12, 2024
256bada
Merge pull request #775 from microsoftgraph/dev
millicentachieng Sep 13, 2024
f6f9330
Merge pull request #779 from microsoftgraph/dev
millicentachieng Sep 16, 2024
9b5dbdf
Merge pull request #781 from microsoftgraph/dev
millicentachieng Sep 17, 2024
5d9188d
Merge pull request #784 from microsoftgraph/dev
millicentachieng Sep 20, 2024
b6bb552
Merge pull request #789 from microsoftgraph/dev
millicentachieng Sep 23, 2024
1406856
Merge pull request #799 from microsoftgraph/dev
millicentachieng Oct 1, 2024
6933b79
Merge pull request #803 from microsoftgraph/dev
millicentachieng Oct 3, 2024
4a7d10e
Merge pull request #805 from microsoftgraph/dev
millicentachieng Oct 4, 2024
bf8a831
Merge pull request #810 from microsoftgraph/dev
millicentachieng Oct 7, 2024
2a00284
Merge pull request #812 from microsoftgraph/dev
millicentachieng Oct 8, 2024
882e7d7
Merge pull request #816 from microsoftgraph/dev
millicentachieng Oct 9, 2024
4dcf9bb
Merge pull request #818 from microsoftgraph/dev
millicentachieng Oct 9, 2024
d961cf8
Merge pull request #821 from microsoftgraph/dev
millicentachieng Oct 11, 2024
5bec3b8
Merge pull request #826 from microsoftgraph/dev
millicentachieng Oct 15, 2024
10d16ee
Merge pull request #834 from microsoftgraph/dev
millicentachieng Oct 22, 2024
b484e5d
Merge pull request #840 from microsoftgraph/dev
millicentachieng Oct 24, 2024
c496065
Merge pull request #842 from microsoftgraph/dev
millicentachieng Oct 25, 2024
0ad0305
Merge pull request #850 from microsoftgraph/dev
millicentachieng Oct 30, 2024
a68149c
Merge pull request #853 from microsoftgraph/dev
millicentachieng Nov 4, 2024
1dfdb42
Merge pull request #858 from microsoftgraph/dev
millicentachieng Nov 5, 2024
131fb0b
Merge pull request #861 from microsoftgraph/dev
millicentachieng Nov 6, 2024
b37720b
Merge pull request #863 from microsoftgraph/dev
millicentachieng Nov 7, 2024
cbd2022
Merge pull request #869 from microsoftgraph/dev
millicentachieng Nov 12, 2024
8fb106a
Merge pull request #871 from microsoftgraph/dev
millicentachieng Nov 13, 2024
103c318
Merge pull request #873 from microsoftgraph/dev
millicentachieng Nov 14, 2024
4a40202
Merge pull request #879 from microsoftgraph/dev
millicentachieng Nov 19, 2024
be3776a
Merge pull request #883 from microsoftgraph/dev
millicentachieng Nov 26, 2024
4b138f3
Merge pull request #891 from microsoftgraph/dev
millicentachieng Dec 2, 2024
9dd9ae5
Merge pull request #896 from microsoftgraph/dev
millicentachieng Dec 3, 2024
88defa1
Merge pull request #899 from microsoftgraph/dev
millicentachieng Dec 5, 2024
e32b199
Merge pull request #901 from microsoftgraph/dev
millicentachieng Dec 5, 2024
2f6f0d7
Merge pull request #905 from microsoftgraph/dev
millicentachieng Dec 9, 2024
525e003
Merge pull request #907 from microsoftgraph/dev
millicentachieng Dec 10, 2024
fd67c17
Merge pull request #911 from microsoftgraph/dev
millicentachieng Dec 11, 2024
d61ce97
Merge pull request #913 from microsoftgraph/dev
millicentachieng Dec 13, 2024
12ba105
Merge pull request #919 from microsoftgraph/dev
millicentachieng Dec 16, 2024
a900288
Merge pull request #923 from microsoftgraph/dev
millicentachieng Dec 18, 2024
527a67e
Merge pull request #925 from microsoftgraph/dev
millicentachieng Dec 19, 2024
635c3fd
Merge pull request #940 from microsoftgraph/dev
millicentachieng Jan 2, 2025
47a12bb
Merge pull request #945 from microsoftgraph/dev
millicentachieng Jan 6, 2025
f4ec102
Merge pull request #947 from microsoftgraph/dev
millicentachieng Jan 7, 2025
7721376
Merge pull request #951 from microsoftgraph/dev
millicentachieng Jan 9, 2025
0ce649f
Merge pull request #953 from microsoftgraph/dev
millicentachieng Jan 10, 2025
b2b307b
Merge pull request #958 from microsoftgraph/dev
millicentachieng Jan 14, 2025
bc5b070
Merge dev into master (#964)
millicentachieng Jan 15, 2025
839b6a2
Merge pull request #972 from microsoftgraph/dev
millicentachieng Jan 20, 2025
9b44a5f
Merge pull request #977 from microsoftgraph/dev
millicentachieng Jan 23, 2025
5073b52
Merge pull request #983 from microsoftgraph/dev
millicentachieng Jan 28, 2025
237fbb8
Merge pull request #987 from microsoftgraph/dev
millicentachieng Jan 29, 2025
740cd0c
Merge pull request #989 from microsoftgraph/dev
millicentachieng Jan 30, 2025
d60df74
Merge branch 'master' of https://github.com/microsoftgraph/microsoft-…
millicentachieng Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.