Nabin Hait 2b682c82e8 Fixed merge conflict

2018-04-04 11:40:16 +05:30

..

academic_term

…

academic_year

…

assessment_criteria

…

assessment_criteria_group

…

assessment_group

…

assessment_plan

…

assessment_plan_criteria

…

assessment_result

self.assertEqual

2018-02-28 21:13:51 +05:30

assessment_result_detail

…

assessment_result_tool

…

course

…

course_assessment_criteria

…

course_schedule

explicitely provide order_by (#13338)

2018-03-20 14:08:44 +05:30

course_scheduling_tool

…

education_settings

…

fee_category

…

fee_component

…

fee_schedule

…

fee_schedule_program

…

fee_schedule_student_group

…

fee_structure

…

fees

self.assertEqual

2018-02-28 21:13:51 +05:30

grading_scale

…

grading_scale_interval

…

guardian

Merge branch 'master' into develop

2018-03-07 13:09:07 +05:30

guardian_interest

…

guardian_student

…

instructor

Data import Tool bug fix (#13165)

2018-03-09 12:33:13 +05:30

instructor_log

…

program

…

program_course

…

program_enrollment

…

program_enrollment_course

…

program_enrollment_fee

…

program_enrollment_tool

Fixed merge conflict

2018-04-04 11:40:16 +05:30

program_enrollment_tool_student

…

program_fee

…

room

…

school_house

…

student

Student Report Card (#13346)

2018-03-21 17:50:42 +05:30

student_admission

…

student_admission_program

…

student_applicant

…

student_attendance

…

student_attendance_tool

…

student_batch_name

…

student_category

…

student_group

self.assertEqual

2018-02-28 21:13:51 +05:30

student_group_creation_tool

…

student_group_creation_tool_course

…

student_group_instructor

…

student_group_student

…

student_guardian

…

student_language

…

student_leave_application

…

student_log

…

student_report_generation_tool

Student Report Card (#13346)

2018-03-21 17:50:42 +05:30

student_sibling

…

student_siblings

…

__init__.py

…