forgot_password_modal.html
2.05 KB
-
Merge branch 'master' into drupal-new · a0fb4d6c
Conflicts: lms/envs/aws.py lms/envs/common.py lms/static/sass/base/_base.scss lms/templates/forgot_password_modal.html
Greg Price committed
Conflicts: lms/envs/aws.py lms/envs/common.py lms/static/sass/base/_base.scss lms/templates/forgot_password_modal.html