Skip to content
Snippets Groups Projects
Commit 48f867bd authored by David Ormsbee's avatar David Ormsbee
Browse files

Merge branch 'master' into ormsbee/verifyuser3

Conflicts:
	lms/envs/common.py
parents 79a9c867 b53d5554
No related branches found
Tags release-2021-06-03-10.17
No related merge requests found
Showing
with 287 additions and 181 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment