Commit f2ab48d0 authored by Jacob Priddy's avatar Jacob Priddy 👌

Merge branch 'master' of gitlab.cs.wallawalla.edu:elock/controller

parents 6dc3fb50 1f946b66
Pipeline #18163 passed with stages
in 4 minutes and 34 seconds