Skip to content
Snippets Groups Projects
Commit 8169f520 authored by Benjamin Zagorsky's avatar Benjamin Zagorsky
Browse files

Merge branch 'develop' of... 

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

Conflicts:
	django_auth_lti/mixins.py
parents dcd36b74 fc2df4df
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 111 additions and 9 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment