Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master', remote-tracking branch 'origin'
books lib/admin view
Libraries controller created & Modifications in Books
calendar
calendar
Approvals
Approval cycle
damage books
add book_id to damage books
Merge branch 'master', remote-tracking branch 'origin'
Class Teacher View
Daily Attendance
Mark Today  Attendance Seperately
Last commit
Merge remote-tracking branch 'origin/library'
conflict with canteen new branch
merge conflict with assesments
syntax mistake by canteen at context_detector
alerts removed