django_auth_lti/mixins.py · cfeb44107769765d6a97f1079ae987506cab5a14 · Marcel Heijink / Django Auth Lti

10 years ago

Merge branch 'develop' of github.com:Harvard-University-iCommons/django-auth-lti into feature/configuration_check

Conflicts:
	django_auth_lti/mixins.py

8169f520

History

Merge branch 'develop' of...

Benjamin Zagorsky authored 10 years ago

Merge branch 'develop' of github.com:Harvard-University-iCommons/django-auth-lti into feature/configuration_check

Conflicts:
	django_auth_lti/mixins.py