Skip to content
Commit 67420201 authored by andryyy's avatar andryyy
Browse files

Solve conflicts 

Merge branch 'master' into dev

Conflicts:
	data/conf/bind9/named.conf
	data/web/modals/footer.php
	docker-compose.yml
parents 51011732 953cadd8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment