Code

Fix conflict#514

Code

Merged

lakshayman merged 26 commits intoReal-Dev-Squad:developReal-Dev-Squad/website-my:developfrom joyguptaa:fix-conflictjoyguptaa/website-my:fix-conflictCopy head branch name to clipboardOct 30, 2023

Commits

Commits on Dec 10, 2022

• Merge pull request Real-Dev-Squad#336 from Real-Dev-Squad/develop

  Show description for 13ccc7f
  ankushdharkar

  authored
  13ccc7f

  Copy full SHA for 13ccc7f

• handles the case when user status not found in collection (Real-Dev-Squad#337) (Real-Dev-Squad#338)

  Show description for a365dcc
  

  rohan09-raj

  and

  heyrandhir

  authored
  a365dcc

  Copy full SHA for a365dcc

• Merge pull request Real-Dev-Squad#339 from Real-Dev-Squad/develop

  Show description for bc6a58a
  rohan09-raj

  authored
  bc6a58a

  Copy full SHA for bc6a58a

Commits on Dec 27, 2022

• Merge pull request Real-Dev-Squad#346 from Real-Dev-Squad/develop

  Show description for 05a121c
  rohan09-raj

  authored
  05a121c

  Copy full SHA for 05a121c

Commits on Feb 19, 2023

• Merge pull request Real-Dev-Squad#357 from Real-Dev-Squad/develop

  Show description for ebe6f50
  rohan09-raj

  authored
  ebe6f50

  Copy full SHA for ebe6f50

Commits on Mar 8, 2023

• Merge pull request Real-Dev-Squad#370 from Real-Dev-Squad/develop

  Show description for 4dd072a
  ankushdharkar

  authored
  4dd072a

  Copy full SHA for 4dd072a

Commits on Mar 11, 2023

• Fix: add toast service, in signup route (Real-Dev-Squad#371) (Real-Dev-Squad#372)

  prakashchoudhary07

  authored
  ccfc0a8

  Copy full SHA for ccfc0a8

• Merge pull request Real-Dev-Squad#374 from Real-Dev-Squad/develop

  Show description for 269d8e2
  prakashchoudhary07

  authored
  269d8e2

  Copy full SHA for 269d8e2

Commits on Apr 27, 2023

• Merge pull request Real-Dev-Squad#395 from Real-Dev-Squad/develop

  Show description for 11e9035
  rohan09-raj

  authored
  11e9035

  Copy full SHA for 11e9035

Commits on May 11, 2023

• Merge pull request Real-Dev-Squad#401 from Real-Dev-Squad/develop

  Show description for 8ec2444
  rohan09-raj

  authored
  8ec2444

  Copy full SHA for 8ec2444

Commits on May 15, 2023

• Merge pull request Real-Dev-Squad#404 from Real-Dev-Squad/develop

  Show description for e0ea26d
  RitikJaiswal75

  authored
  e0ea26d

  Copy full SHA for e0ea26d

Commits on May 30, 2023

• Merge pull request Real-Dev-Squad#411 from Real-Dev-Squad/develop

  Show description for cbefd25
  iamitprakash

  authored
  cbefd25

  Copy full SHA for cbefd25

Commits on Jul 8, 2023

• Merge pull request Real-Dev-Squad#431 from Real-Dev-Squad/develop

  Show description for 613d26a
  ankushdharkar

  authored
  613d26a

  Copy full SHA for 613d26a

Commits on Jul 12, 2023

• Merge pull request Real-Dev-Squad#438 from Real-Dev-Squad/develop

  Show description for 065c232
  ankushdharkar

  authored
  065c232

  Copy full SHA for 065c232

Commits on Jul 17, 2023

• Merge pull request Real-Dev-Squad#448 from Real-Dev-Squad/develop

  Show description for 17c4bda
  rohan09-raj

  authored
  17c4bda

  Copy full SHA for 17c4bda

Commits on Jul 26, 2023

• Dev to main sync (Real-Dev-Squad#459)

  Show description for 8f52558
  Ajeyakrishna-k

  authored
  8f52558

  Copy full SHA for 8f52558

Commits on Jul 29, 2023

• Merge pull request Real-Dev-Squad#463 from Real-Dev-Squad/develop

  Show description for e500558
  ankushdharkar

  authored
  e500558

  Copy full SHA for e500558

Commits on Aug 12, 2023

• Merge pull request Real-Dev-Squad#469 from Real-Dev-Squad/develop

  Show description for 41cdff3
  ankushdharkar

  authored
  41cdff3

  Copy full SHA for 41cdff3

Commits on Aug 16, 2023

• Merge pull request Real-Dev-Squad#475 from Real-Dev-Squad/develop

  Show description for bc08d23
  iamitprakash

  authored
  bc08d23

  Copy full SHA for bc08d23

Commits on Aug 25, 2023

• Merge pull request Real-Dev-Squad#483 from Real-Dev-Squad/develop

  iamitprakash

  authored
  d325ad9

  Copy full SHA for d325ad9

Commits on Sep 7, 2023

• Merge pull request Real-Dev-Squad#490 from Real-Dev-Squad/develop

  iamitprakash

  authored
  aff1f5c

  Copy full SHA for aff1f5c

Commits on Sep 13, 2023

• Merge pull request Real-Dev-Squad#493 from Real-Dev-Squad/develop

  Show description for 17db265
  rohan09-raj

  authored
  17db265

  Copy full SHA for 17db265

Commits on Sep 18, 2023

• Merge pull request Real-Dev-Squad#494 from Real-Dev-Squad/develop

  iamitprakash

  authored
  17fad6e

  Copy full SHA for 17fad6e

Commits on Oct 14, 2023

• Merge pull request Real-Dev-Squad#502 from Real-Dev-Squad/develop

  Show description for ccd6302
  iamitprakash

  authored
  ccd6302

  Copy full SHA for ccd6302

Commits on Oct 25, 2023

• Dev to Main sync (Real-Dev-Squad#504)

  prakashchoudhary07

  authored
  046c2d1

  Copy full SHA for 046c2d1

Commits on Oct 30, 2023

• Merge branch 'main' into fix-conflict

  joyguptaa

  committed
  4ae9024

  Copy full SHA for 4ae9024