guest_management
vendor_management
coflict resolve mistake corrected
Merge branch 'master', remote-tracking branch 'origin'
active process link
Teacher leader index
Staffrecruits Indexes
removal of <<<< in attendance.js
conflict resove
Merge remote-tracking branch 'origin/academics_changes'
conflict resolve
student dashboard added to hrm
revert: Gemfile lock reverted
time table rework