Skip to content
Snippets Groups Projects
Commit 3ebad5c3 authored by Douglas Hall's avatar Douglas Hall
Browse files

Merge branch 'develop' into task/douglashall/TLT-1166/support_multiple_launches 

Conflicts:
	django_auth_lti/verification.py
	setup.py
parents 98e5c11e b1092311
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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