Marius Burkard
2016-06-22 b542800232a61cc9fd82d39c54bc44468af30ce0
refs
author Marius Burkard <m.burkard@pixcept.de>
Wednesday, June 22, 2016 05:25 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Wednesday, June 22, 2016 05:25 -0400
commitb542800232a61cc9fd82d39c54bc44468af30ce0
tree 00f4ca9538fecdcb5a5d03785e9615b3a0618ff9 tree | zip | gz
parent 9f824a7bb996b64731d7b4ee948c8bb52367fc85 view | diff
875504b968611925c406c586bdbf6c7715cc8141 view | diff
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 files modified
4 ■■■■ changed files
install/sql/ispconfig3.sql 2 ●●● diff | view | raw | blame | history
install/tpl/config.inc.php.master 2 ●●● diff | view | raw | blame | history