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

Fix conflict #514

Merged
merged 26 commits into from
Oct 30, 2023
+0 −0
Merged

Fix conflict #514

Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
13ccc7f
Merge pull request #336 from Real-Dev-Squad/develop
ankushdharkar Dec 10, 2022
a365dcc
handles the case when user status not found in collection (#337) (#338)
rohan09-raj Dec 10, 2022
bc6a58a
Merge pull request #339 from Real-Dev-Squad/develop
rohan09-raj Dec 10, 2022
05a121c
Merge pull request #346 from Real-Dev-Squad/develop
rohan09-raj Dec 27, 2022
ebe6f50
Merge pull request #357 from Real-Dev-Squad/develop
rohan09-raj Feb 19, 2023
4dd072a
Merge pull request #370 from Real-Dev-Squad/develop
ankushdharkar Mar 8, 2023
ccfc0a8
Fix: add toast service, in signup route (#371) (#372)
prakashchoudhary07 Mar 11, 2023
269d8e2
Merge pull request #374 from Real-Dev-Squad/develop
prakashchoudhary07 Mar 11, 2023
11e9035
Merge pull request #395 from Real-Dev-Squad/develop
rohan09-raj Apr 27, 2023
8ec2444
Merge pull request #401 from Real-Dev-Squad/develop
rohan09-raj May 11, 2023
e0ea26d
Merge pull request #404 from Real-Dev-Squad/develop
RitikJaiswal75 May 15, 2023
cbefd25
Merge pull request #411 from Real-Dev-Squad/develop
iamitprakash May 30, 2023
613d26a
Merge pull request #431 from Real-Dev-Squad/develop
ankushdharkar Jul 8, 2023
065c232
Merge pull request #438 from Real-Dev-Squad/develop
ankushdharkar Jul 12, 2023
17c4bda
Merge pull request #448 from Real-Dev-Squad/develop
rohan09-raj Jul 17, 2023
8f52558
Dev to main sync (#459)
Ajeyakrishna-k Jul 26, 2023
e500558
Merge pull request #463 from Real-Dev-Squad/develop
ankushdharkar Jul 29, 2023
41cdff3
Merge pull request #469 from Real-Dev-Squad/develop
ankushdharkar Aug 12, 2023
bc08d23
Merge pull request #475 from Real-Dev-Squad/develop
iamitprakash Aug 16, 2023
d325ad9
Merge pull request #483 from Real-Dev-Squad/develop
iamitprakash Aug 25, 2023
aff1f5c
Merge pull request #490 from Real-Dev-Squad/develop
iamitprakash Sep 7, 2023
17db265
Merge pull request #493 from Real-Dev-Squad/develop
rohan09-raj Sep 13, 2023
17fad6e
Merge pull request #494 from Real-Dev-Squad/develop
iamitprakash Sep 18, 2023
ccd6302
Merge pull request #502 from Real-Dev-Squad/develop
iamitprakash Oct 14, 2023
046c2d1
Dev to Main sync (#504)
prakashchoudhary07 Oct 25, 2023
4ae9024
Merge branch 'main' into fix-conflict
joyguptaa Oct 30, 2023
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.