# Conflicts:
#	backend/backend/database.db

Master

See merge request !107

UPDATE: variable name changes

See merge request !104

UPDATE: variable name changes

See merge request !103

Revert "Merge branch 'IT19041926' into 'master'"

See merge request !102

This reverts merge request !98

It19041926

See merge request !98

# Conflicts:
#	backend/database.db
#	backend/models/attribute_model.py
#	backend/models/class_component_model.py
#	backend/routes/submission_routes.py
#	backend/services/class_model_detection_service.py

FRONTEND : Student components updated

See merge request !99

It19076362

See merge request !97

# Conflicts:
#	backend/database.db

BACKEND : class relativity functions added with class_relationship_relativity_service

See merge request !95

Master

See merge request !92

interface detection issue fixed,multiplicity detection code added

See merge request !90

CREATE: full screen loader added

See merge request !89

It19076362

See merge request !88

CREATE: view diagrams integrated

See merge request !87