Merge remote-tracking branch 'remotes/origin/main' into main · maxisoft/Freenom-dns-updater@8009ff7 · GitHub

Commit

Merge remote-tracking branch 'remotes/origin/main' into main

Browse files

# Conflicts:
#	.github/workflows/push_docker_image.yml
#	.github/workflows/test_docker_image.yml
#	docker/Dockerfile
#	docker/Dockerfile.pyinstaller

Loading branch information

maxisoft committed Aug 14, 2020

2 parents 5e3a7d4 + e12f0db commit 8009ff7