Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master', remote-tracking branch 'origin'
route_id added to special day transport
edit in routes and special day
link to show
calendar
calendar
name of locations
Approvals
Approval cycle
Merge branch 'master', remote-tracking branch 'origin'
Class Teacher View
Daily Attendance
Mark Today  Attendance Seperately
edit in locations
Last commit
Merge remote-tracking branch 'origin/library'
conflict with canteen new branch
merge conflict with assesments
syntax mistake by canteen at context_detector