ISPConfig3 devel
parent: bdd734 | patch | commitdiff
Marius Burkard
2015-12-13 d240f6d285ea4696b087763d99089591cb02fcfd
refs
author Marius Burkard <m.burkard@pixcept.de>
Sunday, December 13, 2015 08:08 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Sunday, December 13, 2015 08:08 -0500
commitd240f6d285ea4696b087763d99089591cb02fcfd
tree 1f683f4a42d4aab30f0d26b5cba497ab41805c33 tree | zip | gz
parent bdd7348bc339889d7a8878b4b3bad55f43e4f945 view | diff
54161b34b98a1d3ed8785f2f6850d0e712078be4 view | diff 
Merge branch 'master' into 'master'

Master



See merge request !252
2 files modified
4 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_php.tform.php 2 ●●●●● diff | view | raw | blame | history