Solve conflicts

Browse Source

Merge branch 'master' into dev

Conflicts:
	data/conf/bind9/named.conf
	data/web/modals/footer.php
	docker-compose.yml

master

andryyy 2017-06-21 19:28:28 +02:00

parent 51011732c7 953cadd83c

commit 674202012e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available