signup_modal.html
3.41 KB
-
Merge remote-tracking branch 'origin/master' into template_caching · bde93aea
Conflicts: lms/templates/footer.html lms/templates/signup_modal.html
Bridger Maxwell committed
Conflicts: lms/templates/footer.html lms/templates/signup_modal.html