Manually merge CI files 54/72954/1
authorSawyer Bergeron <sbergeron@iol.unh.edu>
Thu, 7 Oct 2021 21:14:01 +0000 (17:14 -0400)
committerSawyer Bergeron <sbergeron@iol.unh.edu>
Thu, 7 Oct 2021 21:14:01 +0000 (17:14 -0400)
commit5ce0a52b17e530436c298e1b581d37bac853f5a7
tree28c1c83bba8e898b099f8abfe9d5d517a5326197
parent5b70b8f1b8bbbe6aeec43b8d8dfdc6b7cc68bc9c
Manually merge CI files

Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Change-Id: Ic63d5da699578007ef2f2cc373350ded06c66971
requirements.txt
src/api/views.py
src/booking/quick_deployer.py
src/resource_inventory/models.py