Sprint 1 merge

(easier to read old commits)

requested review from @erilo496 and @jonel916

assigned to @fares535

added 3 commits

• a1236bf5...5722ec2b - 2 commits from branch main
• 14b74545 - resolved conflicts

Compare with previous version

added 2 commits

• ea730530 - Mark migrations as generated files
• d858d697 - Merge branch 'feature/setup_html_pages' into 'dev'

Compare with previous version

added 2 commits

• bc8a6c30 - Removing accounts works from my_org
• e6643b4b - Merge branch 'feature/remove_employee' into 'dev'

Compare with previous version

added 1 commit

• fbb02e3a - deleted employees account creation bug fix

Compare with previous version

approved this merge request

added 2 commits

• adca5e8c - can change password and name
• 1a9e79d1 - Merge branch 'feature/change_passname' into 'dev'

Compare with previous version

reset approvals from @jonel916 by pushing to the branch

approved this merge request

approved this merge request

mentioned in commit a6fcc365

merged