Merge branch 'master' of github.com:Stricted/Domain-Control-Panel
authorStricted <info@stricted.de>
Mon, 11 Jan 2016 15:43:12 +0000 (16:43 +0100)
committerStricted <info@stricted.de>
Mon, 11 Jan 2016 15:43:12 +0000 (16:43 +0100)
1  2 
lib/system/DNS.class.php
lib/system/template/plugins/block.lang.php

Simple merge