Skip to content
Commit f9ee9e00 authored by Watchtek's avatar Watchtek
Browse files

Merge branch 'main' into 'dev' 

# Conflicts:
#   requirements.txt
Add requests library for web connection check
parents a719087c 9331f3d1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment