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)
commita8c112870f92f452d9f282e49bdd0e2ade3eae3d
treeec5e8970ed44659810a5e29d8c7a7518445e4638
parent01885ee5f9eae3e5d86ca73b6be744d5ea0bbdf1
parent4da9b9370c1fd6a20e2136611b4c1cc42982b253
Merge branch 'master' of github.com:Stricted/Domain-Control-Panel
lib/system/DNS.class.php
lib/system/template/plugins/block.lang.php