Merge branch 'master', remote-tracking branch 'origin'
Process Link Completion
Merge branch 'master', remote-tracking branch 'origin'
request_new_book
Started Reports
added holidaycalendar and canteenmanagement
donation_of_book
conflict at holiday calendar
Merge remote-tracking branch 'origin/academic_assessment_results'
conflict on assesment merge
seed conflict resolution mestake solved
Merge branch 'master', remote-tracking branch 'origin'
Reports
added canteenmanager view with calendar
Merge branch 'master', remote-tracking branch 'origin'
Faculty_Master
Merge branch 'master', remote-tracking branch 'origin'
Name to Faculty_name in fm
removed model AssessmentTeacherMapping